ncurses 5.9 - patch 20120721

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

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index a54f9ef3e75b219bd1a34d58fd9ab55030f0af62..9993cdf140443800ffc894492dcadfa19e3278af 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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            *
@@ -47,7 +47,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.50 2010/05/01 19:55:48 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.56 2012/02/22 22:34:31 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
@@ -73,7 +73,7 @@ _nc_init_entry(TERMTYPE *const tp)
 #endif
 
     if (stringbuf == 0)
-       stringbuf = (char *) malloc(MAX_STRTAB);
+       stringbuf = (char *) malloc((size_t) MAX_STRTAB);
 
 #if NCURSES_XNAMES
     tp->num_Booleans = BOOLCOUNT;
@@ -131,7 +131,7 @@ _nc_save_str(const char *const string)
            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;
@@ -182,7 +182,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
            } else if (tp->Strings[i] == CANCELLED_STRING) {
                offsets[i] = CANCELLED_OFFSET;
            } else {
-               offsets[i] = tp->Strings[i] - stringbuf;
+               offsets[i] = (int) (tp->Strings[i] - stringbuf);
            }
        }
     }
@@ -191,7 +191,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
        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)
@@ -215,17 +215,20 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
     if (!copy_strings) {
        if ((n = (unsigned) NUM_EXT_NAMES(tp)) != 0) {
            if (n < SIZEOF(offsets)) {
-               unsigned length = 0;
+               size_t length = 0;
+               size_t offset;
                for (i = 0; i < n; i++) {
                    length += strlen(tp->ext_Names[i]) + 1;
-                   offsets[i] = tp->ext_Names[i] - stringbuf;
+                   offsets[i] = (int) (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;
+               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;
                }
            }
        }