ncurses 6.0 - patch 20170812

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

diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c
index 99e4bd4fbd781eb813760ef975d3616bc7e73bea..692113b597dd272e6eb25689f605200f006bc39b 100644 (file)
--- a/ncurses/tinfo/make_hash.c
+++ b/ncurses/tinfo/make_hash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2017 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            *
@@ -44,7 +44,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: make_hash.c,v 1.9 2012/11/18 01:30:03 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.14 2017/06/23 23:53:13 tom Exp $")
 
 /*
  *     _nc_make_hash_table()
@@ -59,6 +59,24 @@ MODULE_ID("$Id: make_hash.c,v 1.9 2012/11/18 01:30:03 tom Exp $")
 #define MODULE_ID(id)          /*nothing */
 #include <tinfo/doalloc.c>
 
+static void
+failed(const char *s)
+{
+    perror(s);
+    exit(EXIT_FAILURE);
+}
+
+static char *
+strmalloc(char *s)
+{
+    size_t need = strlen(s) + 1;
+    char *result = malloc(need);
+    if (result == 0)
+       failed("strmalloc");
+    _nc_STRCPY(result, s, need);
+    return result;
+}
+
 /*
  *     int hash_function(string)
  *
@@ -138,7 +156,7 @@ parse_columns(char *buffer)
 
     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 != '#') {
@@ -221,7 +239,7 @@ main(int argc, char **argv)
            exit(EXIT_FAILURE);
        }
        name_table[n].nte_link = -1;    /* end-of-hash */
-       name_table[n].nte_name = strdup(list[column]);
+       name_table[n].nte_name = strmalloc(list[column]);
        if (!strcmp(list[2], "bool")) {
            name_table[n].nte_type = BOOLEAN;
            name_table[n].nte_index = BoolCount++;
@@ -275,8 +293,7 @@ main(int argc, char **argv)
        printf("static struct name_table_entry *_nc_%s_table = 0;\n\n", root_name);
     } else {
 
-       printf("static struct name_table_entry %s _nc_%s_table[] =\n",
-              bigstring ? "" : "const",
+       printf("static struct name_table_entry const _nc_%s_table[] =\n",
               root_name);
        printf("{\n");
        for (n = 0; n < CAPTABSIZE; n++) {
@@ -309,5 +326,11 @@ main(int argc, char **argv)
     printf("#endif\n\n");
 
     free(hash_table);
+#if NO_LEAKS
+    for (n = 0; (n < CAPTABSIZE); ++n) {
+       free((char *) name_table[n].nte_name);
+    }
+    free(name_table);
+#endif
     return EXIT_SUCCESS;
 }