ncurses 6.3 - patch 20221015

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

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 90febbbd11e8a9da3217d1a55a5d95edb465b9f2..d5148ca6c2518e1e8851d537783dd0d318a97a97 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.76 2022/09/17 21:45:44 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.77 2022/10/15 19:37:33 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -251,8 +251,8 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
     TERMTYPE2 *from = &(source->tterm);
 #if NCURSES_XNAMES
     TERMTYPE2 copy;
-    size_t str_size = 0;
-    char *str_table = NULL;
+    size_t str_size;
+    char *str_table;
 #endif
     unsigned i;
 
@@ -263,7 +263,10 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
     _nc_copy_termtype2(&copy, from);
     from = &copy;
     _nc_align_termtype(to, from);
-    str_size += strlen(to->term_names) + 1;
+    /*
+     * compute the maximum size of the string-table.
+     */
+    str_size = strlen(to->term_names) + 1;
     for_each_string(i, from) {
        if (VALID_STRING(from->Strings[i]))
            str_size += strlen(from->Strings[i]) + 1;
@@ -303,6 +306,46 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
        to->str_table = str_table;
        free(from->str_table);
     }
+    /*
+     * Do the same for the extended-strings (i.e., lists of capabilities).
+     */
+    str_size = 0;
+    for (i = 0; i < NUM_EXT_NAMES(from); ++i) {
+       if (VALID_STRING(from->ext_Names[i]))
+           str_size += strlen(from->ext_Names[i]) + 1;
+    }
+    for (i = 0; i < NUM_EXT_NAMES(to); ++i) {
+       if (VALID_STRING(to->ext_Names[i]))
+           str_size += strlen(to->ext_Names[i]) + 1;
+    }
+    /* allocate a string-table large enough for both source/target, and
+     * copy all of the strings into that table.  In the merge, we will
+     * select from the original source/target lists to construct a new
+     * target list.
+     */
+    if (str_size != 0) {
+       char *str_copied;
+       if ((str_table = malloc(str_size)) == NULL)
+           _nc_err_abort(MSG_NO_MEMORY);
+       str_copied = str_table;
+       for (i = 0; i < NUM_EXT_NAMES(from); ++i) {
+           if (VALID_STRING(from->ext_Names[i])) {
+               strcpy(str_copied, from->ext_Names[i]);
+               from->ext_Names[i] = str_copied;
+               str_copied += strlen(str_copied) + 1;
+           }
+       }
+       for (i = 0; i < NUM_EXT_NAMES(to); ++i) {
+           if (VALID_STRING(to->ext_Names[i])) {
+               strcpy(str_copied, to->ext_Names[i]);
+               to->ext_Names[i] = str_copied;
+               str_copied += strlen(str_copied) + 1;
+           }
+       }
+       free(to->ext_str_table);
+       to->ext_str_table = str_table;
+       free(from->ext_str_table);
+    }
 #endif
     for_each_boolean(i, from) {
        if (to->Booleans[i] != (NCURSES_SBOOL) CANCELLED_BOOLEAN) {
@@ -342,10 +385,7 @@ _nc_merge_entry(ENTRY * const target, ENTRY * const source)
        }
     }
 #if NCURSES_XNAMES
-    /* Discard the data allocated in _nc_copy_termtype2, but do not use
-     * _nc_free_termtype2 because that frees the string-table (which is
-     * not allocated by _nc_copy_termtype2).
-     */
+    /* cleanup */
     free(copy.Booleans);
     free(copy.Numbers);
     free(copy.Strings);