ncurses 5.9 - patch 20121124

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

diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 44a42d6f2c34ac53f5507c52cc1a2153edd79257..47852ad1dcc3015451e306dea15200f0b5cfcc21 100644 (file)
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 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            *
@@ -41,7 +41,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.117 2011/10/22 15:30:24 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.121 2012/11/18 01:18:47 tom Exp $")
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
@@ -252,9 +252,9 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit)
        ptr->num_Numbers = UShort(NUMCOUNT + ext_num_count);
        ptr->num_Strings = UShort(STRCOUNT + ext_str_count);
 
-       ptr->Booleans = typeRealloc(NCURSES_SBOOL, ptr->num_Booleans, ptr->Booleans);
-       ptr->Numbers = typeRealloc(short, ptr->num_Numbers, ptr->Numbers);
-       ptr->Strings = typeRealloc(char *, ptr->num_Strings, ptr->Strings);
+       TYPE_REALLOC(NCURSES_SBOOL, ptr->num_Booleans, ptr->Booleans);
+       TYPE_REALLOC(short, ptr->num_Numbers, ptr->Numbers);
+       TYPE_REALLOC(char *, ptr->num_Strings, ptr->Strings);
 
        TR(TRACE_DATABASE, ("extended header is %d/%d/%d(%d:%d)",
                            ext_bool_count, ext_num_count, ext_str_count,
@@ -279,6 +279,8 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit)
        }
 
        TR(TRACE_DATABASE, ("READ extended-offsets @%d", offset));
+       if ((unsigned) (ext_str_count + (int) need) >= (MAX_ENTRY_SIZE / 2))
+           return (TGETENT_NO);
        if ((ext_str_count || need)
            && !read_shorts(buf, ext_str_count + (int) need))
            return (TGETENT_NO);
@@ -315,7 +317,7 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit)
        }
 
        if (need) {
-           if (ext_str_count >= (MAX_ENTRY_SIZE * 2))
+           if (ext_str_count >= (MAX_ENTRY_SIZE / 2))
                return (TGETENT_NO);
            if ((ptr->ext_Names = TYPE_CALLOC(char *, need)) == 0)
                  return (TGETENT_NO);
@@ -410,9 +412,9 @@ make_db_filename(char *filename, unsigned limit, const char *const path)
     if (test < limit) {
        if (size >= lens
            && !strcmp(path + size - lens, suffix))
-           (void) strcpy(filename, path);
+           _nc_STRCPY(filename, path, limit);
        else
-           (void) sprintf(filename, "%s%s", path, suffix);
+           _nc_SPRINTF(filename, _nc_SLIMIT(limit) "%s%s", path, suffix);
        result = TRUE;
     }
     return result;
@@ -437,7 +439,8 @@ make_dir_filename(char *filename,
        unsigned need = (unsigned) (LEAF_LEN + 3 + strlen(path) + strlen(name));
 
        if (need <= limit) {
-           (void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name);
+           _nc_SPRINTF(filename, _nc_SLIMIT(limit)
+                       "%s/" LEAF_FMT "/%s", path, *name, name);
            result = TRUE;
        }
     }
@@ -524,7 +527,8 @@ _nc_read_tic_entry(char *filename,
 #if USE_TERMCAP
     else if (code != TGETENT_YES) {
        code = _nc_read_termcap_entry(name, tp);
-       sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source());
+       _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
+                   "%.*s", PATH_MAX - 1, _nc_get_source());
     }
 #endif
     return code;
@@ -545,7 +549,9 @@ _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp)
 {
     int code = TGETENT_NO;
 
-    sprintf(filename, "%.*s", PATH_MAX - 1, name);
+    _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
+               "%.*s", PATH_MAX - 1, name);
+
     if (strlen(name) == 0
        || strcmp(name, ".") == 0
        || strcmp(name, "..") == 0
@@ -570,7 +576,8 @@ _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp)
 #elif USE_TERMCAP
        if (code != TGETENT_YES) {
            code = _nc_read_termcap_entry(name, tp);
-           sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source());
+           _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
+                       "%.*s", PATH_MAX - 1, _nc_get_source());
        }
 #endif
     }