ncurses 6.1 - patch 20191019

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

diff --git a/ncurses/tinfo/make_hash.c b/ncurses/tinfo/make_hash.c
index 09748ee3e1cedcffb93124070b9b3c22adffdedc..906dfafa29fa12128c9b30e56b93bd1fadf86ec0 100644 (file)
--- a/ncurses/tinfo/make_hash.c
+++ b/ncurses/tinfo/make_hash.c
@@ -43,7 +43,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: make_hash.c,v 1.27 2019/07/20 20:14:46 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.29 2019/10/19 21:02:19 tom Exp $")

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


@@ -164,13 +164,11 @@ parse_columns(char *buffer)
 
     int col = 0;
 
 
     int col = 0;
 

-#if NO_LEAKS

     if (buffer == 0) {
        free(list);
        list = 0;
        return 0;
     }
     if (buffer == 0) {
        free(list);
        list = 0;
        return 0;
     }

-#endif

 
     if (*buffer != '#') {
        if (list == 0) {
 
     if (*buffer != '#') {
        if (list == 0) {


@@ -220,11 +218,17 @@ parse_columns(char *buffer)
 static char *
 get_type(int type_mask)
 {
 static char *
 get_type(int type_mask)
 {

-    static char result[40];
+    static char result[80];

     unsigned n;
     _nc_STRCPY(result, L_PAREN, sizeof(result));
     for (n = 0; n < 3; ++n) {
        if ((1 << n) & type_mask) {
     unsigned n;
     _nc_STRCPY(result, L_PAREN, sizeof(result));
     for (n = 0; n < 3; ++n) {
        if ((1 << n) & type_mask) {

+           size_t want = 5 + strlen(typenames[n]);
+           if (want > sizeof(result)) {
+               fprintf(stderr, "Buffer is not large enough for %s + %s\n",
+                       result, typenames[n]);
+               exit(EXIT_FAILURE);
+           }

            if (result[1])
                _nc_STRCAT(result, "|", sizeof(result));
            _nc_STRCAT(result, "1<<", sizeof(result));
            if (result[1])
                _nc_STRCAT(result, "|", sizeof(result));
            _nc_STRCAT(result, "1<<", sizeof(result));


@@ -427,12 +431,11 @@ main(int argc, char **argv)
     }
 
     free(hash_table);
     }
 
     free(hash_table);

-#if NO_LEAKS

     for (n = 0; (n < tablesize); ++n) {
        free((void *) name_table[n].ute_name);
     }
     free(name_table);
     parse_columns(0);
     for (n = 0; (n < tablesize); ++n) {
        free((void *) name_table[n].ute_name);
     }
     free(name_table);
     parse_columns(0);

-#endif
+

     return EXIT_SUCCESS;
 }
     return EXIT_SUCCESS;
 }