ncurses 5.7 - patch 20100306

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

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 3af5f5d83e6b08215d6b954da6af7ca10a900b2b..5b5325daea8bb25354be5558de3bd3fa0cc6e85d 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2010 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            *
@@ -46,9 +46,8 @@
 #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.49 2010/01/23 17:57:43 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -83,7 +82,7 @@ _nc_init_entry(TERMTYPE *const tp)
     tp->ext_Strings = 0;
 #endif
     if (tp->Booleans == 0)
-       tp->Booleans = typeMalloc(char, BOOLCOUNT);
+       tp->Booleans = typeMalloc(NCURSES_SBOOL, BOOLCOUNT);
     if (tp->Numbers == 0)
        tp->Numbers = typeMalloc(short, NUMCOUNT);
     if (tp->Strings == 0)
@@ -145,7 +144,8 @@ NCURSES_EXPORT(void)
 _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;
     TERMTYPE *tp = &(ep->tterm);
@@ -171,14 +171,18 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
        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)) {
-       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] = tp->Strings[i] - stringbuf;
+           }
+       }
     }
 
     for (i = 0; i < nuses; i++) {
@@ -194,28 +198,33 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 
     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 ((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)) {
+               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;
+               }
            }
        }
     }
@@ -245,13 +254,13 @@ _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
            if (mergebool == CANCELLED_BOOLEAN)
                to->Booleans[i] = FALSE;
            else if (mergebool == TRUE)
-               to->Booleans[i] = mergebool;
+               to->Booleans[i] = (char) mergebool;
        }
     }
 
     for_each_number(i, from) {
        if (to->Numbers[i] != CANCELLED_NUMERIC) {
-           int mergenum = from->Numbers[i];
+           short mergenum = from->Numbers[i];
 
            if (mergenum == CANCELLED_NUMERIC)
                to->Numbers[i] = ABSENT_NUMERIC;
@@ -281,7 +290,9 @@ _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
 NCURSES_EXPORT(void)
 _nc_alloc_entry_leaks(void)
 {
-    FreeAndNull(stringbuf);
+    if (stringbuf != 0) {
+       FreeAndNull(stringbuf);
+    }
     next_free = 0;
 }
 #endif