ncurses 6.3 - patch 20220917

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

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 0bc93942ca42a627e96467fc852b1273a708fd3a..90febbbd11e8a9da3217d1a55a5d95edb465b9f2 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -48,13 +48,11 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.68 2022/02/26 22:19:31 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.76 2022/09/17 21:45:44 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
-#define MAX_STRTAB     4096    /* documented maximum entry size */
-
 static char *stringbuf;                /* buffer for string capabilities */
 static size_t next_free;       /* next free character in stringbuf */
 
@@ -62,6 +60,8 @@ NCURSES_EXPORT(void)
 _nc_init_entry(ENTRY * const tp)
 /* initialize a terminal type data block */
 {
+    DEBUG(2, (T_CALLED("_nc_init_entry(tp=%p)"), (void *) tp));
+
     if (tp == NULL) {
 #if NO_LEAKS
        if (stringbuf != NULL) {
@@ -74,23 +74,30 @@ _nc_init_entry(ENTRY * const tp)
     }
 
     if (stringbuf == NULL)
-       TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
+       TYPE_CALLOC(char, (size_t) MAX_ENTRY_SIZE, stringbuf);
 
     next_free = 0;
 
     _nc_init_termtype(&(tp->tterm));
+
+    DEBUG(2, (T_RETURN("")));
 }
 
 NCURSES_EXPORT(ENTRY *)
 _nc_copy_entry(ENTRY * oldp)
 {
-    ENTRY *newp = typeCalloc(ENTRY, 1);
+    ENTRY *newp;
 
+    DEBUG(2, (T_CALLED("_nc_copy_entry(oldp=%p)"), (void *) oldp));
+
+    newp = typeCalloc(ENTRY, 1);
     if (newp != NULL) {
        *newp = *oldp;
        _nc_copy_termtype2(&(newp->tterm), &(oldp->tterm));
     }
-    return newp;
+
+    DEBUG(2, (T_RETURN("%p"), (void *) newp));
+    return (newp);
 }
 
 /* save a copy of string in the string buffer */
@@ -99,9 +106,10 @@ _nc_save_str(const char *string)
 {
     char *result = 0;
     size_t old_next_free = next_free;
-    size_t len;
 
     if (stringbuf != NULL) {
+       size_t len;
+
        if (!VALID_STRING(string))
            string = "";
        len = strlen(string) + 1;
@@ -111,11 +119,11 @@ _nc_save_str(const char *string)
             * Cheat a little by making an empty string point to the end of the
             * previous string.
             */
-           if (next_free < MAX_STRTAB) {
+           if (next_free < MAX_ENTRY_SIZE) {
                result = (stringbuf + next_free - 1);
            }
-       } else if (next_free + len < MAX_STRTAB) {
-           _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB);
+       } else if (next_free + len < MAX_ENTRY_SIZE) {
+           _nc_STRCPY(&stringbuf[next_free], string, MAX_ENTRY_SIZE);
            DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
            DEBUG(7, ("at location %d", (int) next_free));
            next_free += len;
@@ -137,6 +145,8 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
     unsigned nuses;
     TERMTYPE2 *tp;
 
+    DEBUG(2, (T_CALLED("_nc_wrap_entry(ep=%p, copy_strings=%d)"), (void *)
+             ep, copy_strings));
     if (ep == NULL || stringbuf == NULL)
        _nc_err_abort("_nc_wrap_entry called without initialization");
 
@@ -224,11 +234,13 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 #endif
 
     for (i = 0; i < nuses; i++) {
-       if (useoffsets[i] == ABSENT_OFFSET)
+       if (useoffsets[i] == ABSENT_OFFSET) {
            ep->uses[i].name = 0;
-       else
-           ep->uses[i].name = (tp->str_table + useoffsets[i]);
+       } else {
+           ep->uses[i].name = strdup(tp->str_table + useoffsets[i]);
+       }
     }
+    DEBUG(2, (T_RETURN("")));
 }
 
 NCURSES_EXPORT(void)
@@ -239,6 +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;
 #endif
     unsigned i;
 
@@ -249,6 +263,46 @@ _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;
+    for_each_string(i, from) {
+       if (VALID_STRING(from->Strings[i]))
+           str_size += strlen(from->Strings[i]) + 1;
+    }
+    for_each_string(i, to) {
+       if (VALID_STRING(to->Strings[i]))
+           str_size += strlen(to->Strings[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;
+       strcpy(str_copied, to->term_names);
+       to->term_names = str_copied;
+       str_copied += strlen(str_copied) + 1;
+       for_each_string(i, from) {
+           if (VALID_STRING(from->Strings[i])) {
+               strcpy(str_copied, from->Strings[i]);
+               from->Strings[i] = str_copied;
+               str_copied += strlen(str_copied) + 1;
+           }
+       }
+       for_each_string(i, to) {
+           if (VALID_STRING(to->Strings[i])) {
+               strcpy(str_copied, to->Strings[i]);
+               to->Strings[i] = str_copied;
+               str_copied += strlen(str_copied) + 1;
+           }
+       }
+       free(to->str_table);
+       to->str_table = str_table;
+       free(from->str_table);
+    }
 #endif
     for_each_boolean(i, from) {
        if (to->Booleans[i] != (NCURSES_SBOOL) CANCELLED_BOOLEAN) {