ncurses 5.9 - patch 20130928

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

diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c
index 83e8a6881d07bb710a72cd2d79754367b2babdb9..37ac7651424c779a8bd0586ca3aa25c02e488ce6 100644 (file)
--- a/ncurses/tinfo/make_hash.c
+++ b/ncurses/tinfo/make_hash.c
@@ -44,7 +44,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: make_hash.c,v 1.11 2013/01/26 22:00:11 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.13 2013/09/28 20:55:47 tom Exp $")

 
 /*
  *     _nc_make_hash_table()
 
 /*
  *     _nc_make_hash_table()


@@ -69,10 +69,11 @@ failed(const char *s)
 static char *
 strmalloc(char *s)
 {
 static char *
 strmalloc(char *s)
 {

-    char *result = malloc(strlen(s) + 1);
+    size_t need = strlen(s) + 1;
+    char *result = malloc(need);

     if (result == 0)
     if (result == 0)

-       failed("strmalloc");
-    strcpy(result, s);
+       failed("strmalloc");
+    _nc_STRCPY(result, s, need);

     return result;
 }
 
     return result;
 }
 


@@ -155,7 +156,7 @@ parse_columns(char *buffer)
 
     int col = 0;
 
 
     int col = 0;
 

-    if (list == 0 && (list = typeCalloc(char *, MAX_COLUMNS)) == 0)
+    if (list == 0 && (list = typeCalloc(char *, (MAX_COLUMNS + 1))) == 0)

          return (0);
 
     if (*buffer != '#') {
          return (0);
 
     if (*buffer != '#') {