ncurses 6.3 - patch 20220724

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

diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index 9f866323058ee373f6b0f6368a9d952a31dff2e8..42ef05f47752b6146ca98d6425afbeb1d3f65cfb 100644 (file)
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -43,7 +43,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_ttype.c,v 1.40 2022/05/08 00:11:44 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.44 2022/06/18 20:40:54 tom Exp $")
 
 #if NCURSES_XNAMES
 /*
@@ -552,12 +552,14 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
     new_table = NULL;
     for (pass = 0; pass < 2; ++pass) {
        size_t str_size = 0;
-       if (pass) {
-           dst->term_names = new_table + str_size;
-           strcpy(dst->term_names + str_size, src->term_names);
+       if (src->term_names != NULL) {
+           if (pass) {
+               dst->term_names = new_table + str_size;
+               strcpy(dst->term_names + str_size, src->term_names);
+           }
+           str_size += strlen(src->term_names) + 1;
        }
-       str_size += strlen(src->term_names) + 1;
-       for (i = 0; i < NUM_STRINGS(dst); ++i) {
+       for (i = 0; i < STRCOUNT; ++i) {
            if (VALID_STRING(src->Strings[i])) {
                if (pass) {
                    strcpy(new_table + str_size, src->Strings[i]);
@@ -625,6 +627,19 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
        new_table = NULL;
        for (pass = 0; pass < 2; ++pass) {
            size_t str_size = 0;
+           char *raw_data = src->ext_str_table;
+           if (raw_data != NULL) {
+               for (i = 0; i < src->ext_Strings; ++i) {
+                   size_t skip = strlen(raw_data) + 1;
+                   if (skip != 1) {
+                       if (pass) {
+                           strcpy(new_table + str_size, raw_data);
+                       }
+                       str_size += skip;
+                       raw_data += skip;
+                   }
+               }
+           }
            for (i = 0; i < NUM_EXT_NAMES(dst); ++i) {
                if (VALID_STRING(src->ext_Names[i])) {
                    if (pass) {
@@ -638,7 +653,7 @@ copy_termtype(TERMTYPE2 *dst, const TERMTYPE2 *src, int mode)
                dst->ext_str_table = new_table;
            } else {
                ++str_size;
-               new_table = malloc(str_size);
+               new_table = calloc(str_size, 1);
            }
        }
     } else {