ncurses 6.2 - patch 20210227

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

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 3af5f5d83e6b08215d6b954da6af7ca10a900b2b..4bf7d6c8a082248e4fd59eb6169f39808f1d7bb7 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -46,9 +47,8 @@
 #include <curses.priv.h>
 
 #include <tic.h>
 #include <curses.priv.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: alloc_entry.c,v 1.45 2005/06/04 22:07:53 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.64 2020/02/02 23:34:34 tom Exp $")

 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2


@@ -59,46 +59,24 @@ static char *stringbuf;             /* buffer for string capabilities */
 static size_t next_free;       /* next free character in stringbuf */
 
 NCURSES_EXPORT(void)
 static size_t next_free;       /* next free character in stringbuf */
 
 NCURSES_EXPORT(void)

-_nc_init_entry(TERMTYPE *const tp)
+_nc_init_entry(ENTRY * const tp)

 /* initialize a terminal type data block */
 {
 /* initialize a terminal type data block */
 {

-    unsigned i;
-

 #if NO_LEAKS
 #if NO_LEAKS

-    if (tp == 0 && stringbuf != 0) {
-       FreeAndNull(stringbuf);
+    if (tp == 0) {
+       if (stringbuf != 0) {
+           FreeAndNull(stringbuf);
+       }

        return;
     }
 #endif
 
     if (stringbuf == 0)
        return;
     }
 #endif
 
     if (stringbuf == 0)

-       stringbuf = (char *) malloc(MAX_STRTAB);
-
-#if NCURSES_XNAMES
-    tp->num_Booleans = BOOLCOUNT;
-    tp->num_Numbers = NUMCOUNT;
-    tp->num_Strings = STRCOUNT;
-    tp->ext_Booleans = 0;
-    tp->ext_Numbers = 0;
-    tp->ext_Strings = 0;
-#endif
-    if (tp->Booleans == 0)
-       tp->Booleans = typeMalloc(char, BOOLCOUNT);
-    if (tp->Numbers == 0)
-       tp->Numbers = typeMalloc(short, NUMCOUNT);
-    if (tp->Strings == 0)
-       tp->Strings = typeMalloc(char *, STRCOUNT);
-
-    for_each_boolean(i, tp)
-       tp->Booleans[i] = FALSE;
-
-    for_each_number(i, tp)
-       tp->Numbers[i] = ABSENT_NUMERIC;
-
-    for_each_string(i, tp)
-       tp->Strings[i] = ABSENT_STRING;
+       TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);

 
     next_free = 0;
 
     next_free = 0;

+
+    _nc_init_termtype(&(tp->tterm));

 }
 
 NCURSES_EXPORT(ENTRY *)
 }
 
 NCURSES_EXPORT(ENTRY *)


@@ -108,7 +86,7 @@ _nc_copy_entry(ENTRY * oldp)
 
     if (newp != 0) {
        *newp = *oldp;
 
     if (newp != 0) {
        *newp = *oldp;

-       _nc_copy_termtype(&(newp->tterm), &(oldp->tterm));
+       _nc_copy_termtype2(&(newp->tterm), &(oldp->tterm));

     }
     return newp;
 }
     }
     return newp;
 }


@@ -119,7 +97,11 @@ _nc_save_str(const char *const string)
 {
     char *result = 0;
     size_t old_next_free = next_free;
 {
     char *result = 0;
     size_t old_next_free = next_free;

-    size_t len = strlen(string) + 1;
+    size_t len;
+
+    if (!VALID_STRING(string))
+       return _nc_save_str("");
+    len = strlen(string) + 1;

 
     if (len == 1 && next_free != 0) {
        /*
 
     if (len == 1 && next_free != 0) {
        /*


@@ -130,13 +112,13 @@ _nc_save_str(const char *const string)
            result = (stringbuf + next_free - 1);
        }
     } else if (next_free + len < MAX_STRTAB) {
            result = (stringbuf + next_free - 1);
        }
     } else if (next_free + len < MAX_STRTAB) {

-       strcpy(&stringbuf[next_free], string);
+       _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB);

        DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
        DEBUG(7, ("at location %d", (int) next_free));
        next_free += len;
        result = (stringbuf + old_next_free);
     } else {
        DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
        DEBUG(7, ("at location %d", (int) next_free));
        next_free += len;
        result = (stringbuf + old_next_free);
     } else {

-       _nc_warning("Too much data, some is lost");
+       _nc_warning("Too much data, some is lost: %s", string);

     }
     return result;
 }
     }
     return result;
 }


@@ -145,10 +127,11 @@ NCURSES_EXPORT(void)
 _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 /* copy the string parts to allocated storage, preserving pointers to it */
 {
 _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 /* copy the string parts to allocated storage, preserving pointers to it */
 {

-    int offsets[MAX_ENTRY_SIZE / 2], useoffsets[MAX_USES];
+    int offsets[MAX_ENTRY_SIZE / sizeof(short)];
+    int useoffsets[MAX_USES];

     unsigned i, n;
     unsigned nuses = ep->nuses;
     unsigned i, n;
     unsigned nuses = ep->nuses;

-    TERMTYPE *tp = &(ep->tterm);
+    TERMTYPE2 *tp = &(ep->tterm);

 
     if (copy_strings) {
        next_free = 0;          /* clear static storage */
 
     if (copy_strings) {
        next_free = 0;          /* clear static storage */


@@ -171,51 +154,61 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
        free(tp->str_table);
     }
 
        free(tp->str_table);
     }
 

-    n = tp->term_names - stringbuf;
+    assert(tp->term_names >= stringbuf);
+    n = (unsigned) (tp->term_names - stringbuf);

     for_each_string(i, &(ep->tterm)) {
     for_each_string(i, &(ep->tterm)) {

-       if (tp->Strings[i] == ABSENT_STRING)
-           offsets[i] = ABSENT_OFFSET;
-       else if (tp->Strings[i] == CANCELLED_STRING)
-           offsets[i] = CANCELLED_OFFSET;
-       else
-           offsets[i] = tp->Strings[i] - stringbuf;
+       if (i < SIZEOF(offsets)) {
+           if (tp->Strings[i] == ABSENT_STRING) {
+               offsets[i] = ABSENT_OFFSET;
+           } else if (tp->Strings[i] == CANCELLED_STRING) {
+               offsets[i] = CANCELLED_OFFSET;
+           } else {
+               offsets[i] = (int) (tp->Strings[i] - stringbuf);
+           }
+       }

     }
 
     for (i = 0; i < nuses; i++) {
        if (ep->uses[i].name == 0)
            useoffsets[i] = ABSENT_OFFSET;
        else
     }
 
     for (i = 0; i < nuses; i++) {
        if (ep->uses[i].name == 0)
            useoffsets[i] = ABSENT_OFFSET;
        else

-           useoffsets[i] = ep->uses[i].name - stringbuf;
+           useoffsets[i] = (int) (ep->uses[i].name - stringbuf);

     }
 
     }
 

-    if ((tp->str_table = typeMalloc(char, next_free)) == (char *) 0)
-         _nc_err_abort(MSG_NO_MEMORY);
+    TYPE_MALLOC(char, next_free, tp->str_table);

     (void) memcpy(tp->str_table, stringbuf, next_free);
 
     tp->term_names = tp->str_table + n;
     for_each_string(i, &(ep->tterm)) {
     (void) memcpy(tp->str_table, stringbuf, next_free);
 
     tp->term_names = tp->str_table + n;
     for_each_string(i, &(ep->tterm)) {

-       if (offsets[i] == ABSENT_OFFSET)
-           tp->Strings[i] = ABSENT_STRING;
-       else if (offsets[i] == CANCELLED_OFFSET)
-           tp->Strings[i] = CANCELLED_STRING;
-       else
-           tp->Strings[i] = tp->str_table + offsets[i];
+       if (i < SIZEOF(offsets)) {
+           if (offsets[i] == ABSENT_OFFSET) {
+               tp->Strings[i] = ABSENT_STRING;
+           } else if (offsets[i] == CANCELLED_OFFSET) {
+               tp->Strings[i] = CANCELLED_STRING;
+           } else {
+               tp->Strings[i] = tp->str_table + offsets[i];
+           }
+       }

     }
 
 #if NCURSES_XNAMES
     if (!copy_strings) {
     }
 
 #if NCURSES_XNAMES
     if (!copy_strings) {

-       if ((n = NUM_EXT_NAMES(tp)) != 0) {
-           unsigned length = 0;
-           for (i = 0; i < n; i++) {
-               length += strlen(tp->ext_Names[i]) + 1;
-               offsets[i] = tp->ext_Names[i] - stringbuf;
-           }
-           if ((tp->ext_str_table = typeMalloc(char, length)) == 0)
-                 _nc_err_abort(MSG_NO_MEMORY);
-           for (i = 0, length = 0; i < n; i++) {
-               tp->ext_Names[i] = tp->ext_str_table + length;
-               strcpy(tp->ext_Names[i], stringbuf + offsets[i]);
-               length += strlen(tp->ext_Names[i]) + 1;
+       if ((n = (unsigned) NUM_EXT_NAMES(tp)) != 0) {
+           if (n < SIZEOF(offsets)) {
+               size_t length = 0;
+               size_t offset;
+               for (i = 0; i < n; i++) {
+                   length += strlen(tp->ext_Names[i]) + 1;
+                   offsets[i] = (int) (tp->ext_Names[i] - stringbuf);
+               }
+               TYPE_MALLOC(char, length, tp->ext_str_table);
+               for (i = 0, offset = 0; i < n; i++) {
+                   tp->ext_Names[i] = tp->ext_str_table + offset;
+                   _nc_STRCPY(tp->ext_Names[i],
+                              stringbuf + offsets[i],
+                              length - offset);
+                   offset += strlen(tp->ext_Names[i]) + 1;
+               }

            }
        }
     }
            }
        }
     }


@@ -230,12 +223,22 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 }
 
 NCURSES_EXPORT(void)
 }
 
 NCURSES_EXPORT(void)

-_nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
+_nc_merge_entry(ENTRY * const target, ENTRY * const source)

 /* merge capabilities from `from' entry into `to' entry */
 {
 /* merge capabilities from `from' entry into `to' entry */
 {

+    TERMTYPE2 *to = &(target->tterm);
+    TERMTYPE2 *from = &(source->tterm);
+#if NCURSES_XNAMES
+    TERMTYPE2 copy;
+#endif

     unsigned i;
 
     unsigned i;
 

+    if (source == 0 || from == 0 || target == 0 || to == 0)
+       return;
+

 #if NCURSES_XNAMES
 #if NCURSES_XNAMES

+    _nc_copy_termtype2(&copy, from);
+    from = &copy;

     _nc_align_termtype(to, from);
 #endif
     for_each_boolean(i, from) {
     _nc_align_termtype(to, from);
 #endif
     for_each_boolean(i, from) {


@@ -245,7 +248,7 @@ _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
            if (mergebool == CANCELLED_BOOLEAN)
                to->Booleans[i] = FALSE;
            else if (mergebool == TRUE)
            if (mergebool == CANCELLED_BOOLEAN)
                to->Booleans[i] = FALSE;
            else if (mergebool == TRUE)

-               to->Booleans[i] = mergebool;
+               to->Booleans[i] = (NCURSES_SBOOL) mergebool;

        }
     }
 
        }
     }
 


@@ -256,7 +259,7 @@ _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
            if (mergenum == CANCELLED_NUMERIC)
                to->Numbers[i] = ABSENT_NUMERIC;
            else if (mergenum != ABSENT_NUMERIC)
            if (mergenum == CANCELLED_NUMERIC)
                to->Numbers[i] = ABSENT_NUMERIC;
            else if (mergenum != ABSENT_NUMERIC)

-               to->Numbers[i] = mergenum;
+               to->Numbers[i] = (NCURSES_INT2) mergenum;

        }
     }
 
        }
     }
 


@@ -275,13 +278,25 @@ _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
                to->Strings[i] = mergestring;
        }
     }
                to->Strings[i] = mergestring;
        }
     }

+#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).
+     */
+    free(copy.Booleans);
+    free(copy.Numbers);
+    free(copy.Strings);
+    free(copy.ext_Names);
+#endif

 }
 
 #if NO_LEAKS
 NCURSES_EXPORT(void)
 _nc_alloc_entry_leaks(void)
 {
 }
 
 #if NO_LEAKS
 NCURSES_EXPORT(void)
 _nc_alloc_entry_leaks(void)
 {

-    FreeAndNull(stringbuf);
+    if (stringbuf != 0) {
+       FreeAndNull(stringbuf);
+    }

     next_free = 0;
 }
 #endif
     next_free = 0;
 }
 #endif