X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fread_entry.c;h=e67ced4897eeb8ac07ca3c966291d25ac6fe9f13;hp=44a42d6f2c34ac53f5507c52cc1a2153edd79257;hb=e6f4ffe150c7d919792f29a70b4f031cfab5ef06;hpb=03f728e5bb3630a54fffc4a2ff2f8dbfcce9088e diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c index 44a42d6f..e67ced48 100644 --- 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-2012,2013 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,11 +41,11 @@ #include -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.123 2013/05/25 20:17:49 tom Exp $") #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) -#if USE_DATABASE +#if NCURSES_USE_DATABASE static void convert_shorts(char *buf, short *Numbers, int count) { @@ -124,7 +124,7 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) int offset = 0; int name_size, bool_count, num_count, str_count, str_size; int i; - char buf[MAX_ENTRY_SIZE + 1]; + char buf[MAX_ENTRY_SIZE + 2]; char *string_table; unsigned want, have; @@ -159,7 +159,7 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) want = (unsigned) (str_size + name_size + 1); if (str_size) { /* try to allocate space for the string table */ - if (str_count * 2 >= (int) sizeof(buf) + if (str_count * 2 >= MAX_ENTRY_SIZE || (string_table = typeMalloc(char, want)) == 0) { return (TGETENT_NO); } @@ -238,9 +238,9 @@ _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) unsigned need = (unsigned) (ext_bool_count + ext_num_count + ext_str_count); int base = 0; - if (need >= sizeof(buf) - || ext_str_size >= (int) sizeof(buf) - || ext_str_limit >= (int) sizeof(buf) + if (need >= (MAX_ENTRY_SIZE / 2) + || ext_str_size >= MAX_ENTRY_SIZE + || ext_str_limit >= MAX_ENTRY_SIZE || ext_bool_count < 0 || ext_num_count < 0 || ext_str_count < 0 @@ -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; @@ -430,14 +432,15 @@ make_dir_filename(char *filename, { bool result = FALSE; -#if USE_TERMCAP +#if NCURSES_USE_TERMCAP if (_nc_is_dir_path(path)) #endif { 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; } } @@ -521,15 +524,16 @@ _nc_read_tic_entry(char *filename, if (make_dir_filename(filename, limit, path, name)) { code = _nc_read_file_entry(filename, tp); } -#if USE_TERMCAP +#if NCURSES_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; } -#endif /* USE_DATABASE */ +#endif /* NCURSES_USE_DATABASE */ /* * _nc_read_entry(char *name, char *filename, TERMTYPE *tp) @@ -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 @@ -553,7 +559,7 @@ _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp) || strchr(name, NCURSES_PATHSEP) != 0) { TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", name)); } else { -#if USE_DATABASE +#if NCURSES_USE_DATABASE DBDIRS state; int offset; const char *path; @@ -567,10 +573,11 @@ _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp) break; } } -#elif USE_TERMCAP +#elif NCURSES_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 }