ncurses 6.0 - patch 20161126

[ncurses.git] / ncurses / tinfo / home_terminfo.c

diff --git a/ncurses/tinfo/home_terminfo.c b/ncurses/tinfo/home_terminfo.c
index 92c26705a016fb2b7ebaf12a7fbc4f9fac82f3c1..5c2869d4800f5797ed1062c5361a96ff955bd41f 100644 (file)
--- a/ncurses/tinfo/home_terminfo.c
+++ b/ncurses/tinfo/home_terminfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -37,9 +37,7 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: home_terminfo.c,v 1.10 2007/04/21 23:11:53 tom Exp $")
-
-#define my_length (strlen(home) + sizeof(PRIVATE_INFO))
+MODULE_ID("$Id: home_terminfo.c,v 1.16 2016/05/28 23:22:52 tom Exp $")
 
 /* ncurses extension...fall back on user's private directory */
 
@@ -50,16 +48,15 @@ _nc_home_terminfo(void)
 {
     char *result = 0;
 #if USE_HOME_TERMINFO
-    char *home;
-
     if (use_terminfo_vars()) {
+
        if (MyBuffer == 0) {
-           if ((home = getenv("HOME")) != 0
-               && my_length <= PATH_MAX) {
-               MyBuffer = typeMalloc(char, my_length);
-               if (MyBuffer == 0)
-                   _nc_err_abort(MSG_NO_MEMORY);
-               (void) sprintf(MyBuffer, PRIVATE_INFO, home);
+           char *home;
+
+           if ((home = getenv("HOME")) != 0) {
+               size_t want = (strlen(home) + sizeof(PRIVATE_INFO));
+               TYPE_MALLOC(char, want, MyBuffer);
+               _nc_SPRINTF(MyBuffer, _nc_SLIMIT(want) PRIVATE_INFO, home);
            }
        }
        result = MyBuffer;