X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fread_entry.c;h=b0f360eca800a646f3e7cced5814b39b92a18e4a;hp=92b532636b03fe0869b58451b0b31ca8f16f859d;hb=HEAD;hpb=1501ae2a13db0ffd2db8404c24aa5010a88ea91b diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c index 92b53263..b0f360ec 100644 --- a/ncurses/tinfo/read_entry.c +++ b/ncurses/tinfo/read_entry.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * + * Copyright 2018-2022,2023 Thomas E. Dickey * + * Copyright 1998-2016,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 * @@ -41,9 +42,7 @@ #include -MODULE_ID("$Id: read_entry.c,v 1.144 2017/10/23 21:20:06 tom Exp $") - -#define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) +MODULE_ID("$Id: read_entry.c,v 1.171 2023/09/16 16:30:34 tom Exp $") #define MyNumber(n) (short) LOW_MSB(n) @@ -57,9 +56,9 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) int i; size_t j; size_t size = SIZEOF_SHORT; - unsigned char ch; for (i = 0; i < count; i++) { unsigned mask = 0xff; + unsigned char ch = 0; Numbers[i] = 0; for (j = 0; j < size; ++j) { ch = UChar(*buf++); @@ -139,11 +138,13 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) } #endif -static void -convert_strings(char *buf, char **Strings, int count, int size, char *table) +static bool +convert_strings(char *buf, char **Strings, int count, int size, + char *table, bool always) { int i; char *p; + bool success = TRUE; for (i = 0; i < count; i++) { if (IS_NEG1(buf + 2 * i)) { @@ -153,20 +154,44 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) } else if (MyNumber(buf + 2 * i) > size) { Strings[i] = ABSENT_STRING; } else { - Strings[i] = (MyNumber(buf + 2 * i) + table); - TR(TRACE_DATABASE, ("Strings[%d] = %s", i, _nc_visbuf(Strings[i]))); + int nn = MyNumber(buf + 2 * i); + if (nn >= 0 && nn < size) { + Strings[i] = (nn + table); + TR(TRACE_DATABASE, ("Strings[%d] = %s", i, + _nc_visbuf(Strings[i]))); + } else { + TR(TRACE_DATABASE, + ("found out-of-range index %d to Strings[%d]", nn, i)); + success = FALSE; + break; + } } /* make sure all strings are NUL terminated */ if (VALID_STRING(Strings[i])) { - for (p = Strings[i]; p <= table + size; p++) + for (p = Strings[i]; p < table + size; p++) if (*p == '\0') break; /* if there is no NUL, ignore the string */ - if (p > table + size) + if (p >= table + size) { Strings[i] = ABSENT_STRING; + } else if (p == Strings[i] && always) { + TR(TRACE_DATABASE, + ("found empty but required Strings[%d]", i)); + success = FALSE; + break; + } + } else if (always) { /* names are always needed */ + TR(TRACE_DATABASE, + ("found invalid but required Strings[%d]", i)); + success = FALSE; + break; } } + if (!success) { + _nc_warning("corrupt data found in convert_strings"); + } + return success; } static int @@ -202,6 +227,8 @@ _nc_init_termtype(TERMTYPE2 *const tp) { unsigned i; + DEBUG(2, (T_CALLED("_nc_init_termtype(tp=%p)"), (void *) tp)); + #if NCURSES_XNAMES tp->num_Booleans = BOOLCOUNT; tp->num_Numbers = NUMCOUNT; @@ -225,6 +252,8 @@ _nc_init_termtype(TERMTYPE2 *const tp) for_each_string(i, tp) tp->Strings[i] = ABSENT_STRING; + + DEBUG(2, (T_RETURN(""))); } #if NCURSES_USE_DATABASE @@ -256,7 +285,6 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) char buf[MAX_ENTRY_SIZE + 2]; char *string_table; unsigned want, have; - bool need_ints; size_t (*convert_numbers) (char *, NCURSES_INT2 *, int); int size_of_numbers; int max_entry_size = MAX_ENTRY_SIZE; @@ -275,7 +303,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) returnDB(TGETENT_NO); } #if NCURSES_EXT_NUMBERS - if ((need_ints = (LOW_MSB(buf) == MAGIC2))) { + if (LOW_MSB(buf) == MAGIC2) { convert_numbers = convert_32bits; size_of_numbers = SIZEOF_INT2; } else { @@ -284,7 +312,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) size_of_numbers = SIZEOF_SHORT; } #else - if ((need_ints = (LOW_MSB(buf) == MAGIC2))) { + if (LOW_MSB(buf) == MAGIC2) { convert_numbers = convert_32bits; size_of_numbers = SIZEOF_32BITS; } else { @@ -308,6 +336,9 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) || bool_count < 0 || num_count < 0 || str_count < 0 + || bool_count > BOOLCOUNT + || num_count > NUMCOUNT + || str_count > STRCOUNT || str_size < 0) { returnDB(TGETENT_NO); } @@ -320,7 +351,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) } /* grab the name (a null-terminated string) */ - want = min(MAX_NAME_SIZE, (unsigned) name_size); + want = Min(MAX_NAME_SIZE, (unsigned) name_size); ptr->str_table = string_table; ptr->term_names = string_table; if ((have = (unsigned) Read(ptr->term_names, want)) != want) { @@ -333,9 +364,8 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) offset = (int) (have - MAX_NAME_SIZE); /* grab the booleans */ - if ((ptr->Booleans = TYPE_CALLOC(NCURSES_SBOOL, - max(BOOLCOUNT, bool_count))) == 0 - || Read(ptr->Booleans, (unsigned) bool_count) < bool_count) { + TYPE_CALLOC(NCURSES_SBOOL, Max(BOOLCOUNT, bool_count), ptr->Booleans); + if (Read(ptr->Booleans, (unsigned) bool_count) < bool_count) { returnDB(TGETENT_NO); } @@ -348,15 +378,13 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) even_boundary(name_size + bool_count); /* grab the numbers */ - if (!(ptr->Numbers = TYPE_CALLOC(NCURSES_INT2, max(NUMCOUNT, num_count))) - || !read_numbers(buf, num_count)) { + TYPE_CALLOC(NCURSES_INT2, Max(NUMCOUNT, num_count), ptr->Numbers); + if (!read_numbers(buf, num_count)) { returnDB(TGETENT_NO); } convert_numbers(buf, ptr->Numbers, num_count); - if ((ptr->Strings = TYPE_CALLOC(char *, max(STRCOUNT, str_count))) == 0) { - returnDB(TGETENT_NO); - } + TYPE_CALLOC(char *, Max(STRCOUNT, str_count), ptr->Strings); if (str_count) { /* grab the string offsets */ @@ -367,7 +395,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) if (Read(string_table, (unsigned) str_size) != str_size) { returnDB(TGETENT_NO); } - convert_strings(buf, ptr->Strings, str_count, str_size, string_table); + if (!convert_strings(buf, ptr->Strings, str_count, str_size, + string_table, FALSE)) { + returnDB(TGETENT_NO); + } } #if NCURSES_XNAMES @@ -384,18 +415,18 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) int ext_bool_count = MyNumber(buf + 0); int ext_num_count = MyNumber(buf + 2); int ext_str_count = MyNumber(buf + 4); - int ext_str_size = MyNumber(buf + 6); + int ext_str_usage = MyNumber(buf + 6); int ext_str_limit = MyNumber(buf + 8); unsigned need = (unsigned) (ext_bool_count + ext_num_count + ext_str_count); int base = 0; if ((int) need >= (max_entry_size / 2) - || ext_str_size >= max_entry_size + || ext_str_usage >= max_entry_size || ext_str_limit >= max_entry_size || ext_bool_count < 0 || ext_num_count < 0 || ext_str_count < 0 - || ext_str_size < 0 + || ext_str_usage < 0 || ext_str_limit < 0) { returnDB(TGETENT_NO); } @@ -408,9 +439,15 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) TYPE_REALLOC(NCURSES_INT2, 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, - ext_str_size, ext_str_limit)); + TR(TRACE_DATABASE, ("extended header: " + "bool %d, " + "number %d, " + "string %d(%d:%d)", + ext_bool_count, + ext_num_count, + ext_str_count, + ext_str_usage, + ext_str_limit)); TR(TRACE_DATABASE, ("READ %d extended-booleans @%d", ext_bool_count, offset)); @@ -456,38 +493,54 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) } if ((ptr->ext_Strings = UShort(ext_str_count)) != 0) { + int check = (ext_bool_count + ext_num_count + ext_str_count); + TR(TRACE_DATABASE, - ("Before computing extended-string capabilities str_count=%d, ext_str_count=%d", + ("Before computing extended-string capabilities " + "str_count=%d, ext_str_count=%d", str_count, ext_str_count)); - convert_strings(buf, ptr->Strings + str_count, ext_str_count, - ext_str_limit, ptr->ext_str_table); + if (!convert_strings(buf, ptr->Strings + str_count, ext_str_count, + ext_str_limit, ptr->ext_str_table, FALSE)) { + returnDB(TGETENT_NO); + } for (i = ext_str_count - 1; i >= 0; i--) { TR(TRACE_DATABASE, ("MOVE from [%d:%d] %s", i, i + str_count, _nc_visbuf(ptr->Strings[i + str_count]))); ptr->Strings[i + STRCOUNT] = ptr->Strings[i + str_count]; - if (VALID_STRING(ptr->Strings[i + STRCOUNT])) + if (VALID_STRING(ptr->Strings[i + STRCOUNT])) { base += (int) (strlen(ptr->Strings[i + STRCOUNT]) + 1); + ++check; + } TR(TRACE_DATABASE, ("... to [%d] %s", i + STRCOUNT, _nc_visbuf(ptr->Strings[i + STRCOUNT]))); } + TR(TRACE_DATABASE, ("Check table-size: %d/%d", check, ext_str_usage)); +#if 0 + /* + * Phasing in a proper check will be done "later". + */ + if (check != ext_str_usage) + returnDB(TGETENT_NO); +#endif } if (need) { if (ext_str_count >= (max_entry_size / 2)) { returnDB(TGETENT_NO); } - if ((ptr->ext_Names = TYPE_CALLOC(char *, need)) == 0) { - returnDB(TGETENT_NO); - } + TYPE_CALLOC(char *, need, ptr->ext_Names); TR(TRACE_DATABASE, ("ext_NAMES starting @%d in extended_strings, first = %s", base, _nc_visbuf(ptr->ext_str_table + base))); - convert_strings(buf + (2 * ext_str_count), - ptr->ext_Names, - (int) need, - ext_str_limit, ptr->ext_str_table + base); + if (!convert_strings(buf + (2 * ext_str_count), + ptr->ext_Names, + (int) need, + ext_str_limit, ptr->ext_str_table + base, + TRUE)) { + returnDB(TGETENT_NO); + } } TR(TRACE_DATABASE, @@ -533,20 +586,24 @@ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr) int code; if (_nc_access(filename, R_OK) < 0 - || (fp = fopen(filename, "rb")) == 0) { + || (fp = safe_fopen(filename, BIN_R)) == 0) { TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); code = TGETENT_NO; } else { int limit; char buffer[MAX_ENTRY_SIZE + 1]; - if ((limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp)) - > 0) { + limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp); + if (limit > 0) { + const char *old_source = _nc_get_source(); TR(TRACE_DATABASE, ("read terminfo %s", filename)); + if (old_source == NULL) + _nc_set_source(filename); if ((code = _nc_read_termtype(ptr, buffer, limit)) == TGETENT_NO) { _nc_free_termtype2(ptr); } + _nc_set_source(old_source); } else { code = TGETENT_NO; } @@ -646,11 +703,10 @@ decode_hex(const char **source) { int result = 0; int nibble; - int ch; for (nibble = 0; nibble < 2; ++nibble) { + int ch = UChar(**source); result <<= 4; - ch = UChar(**source); *source += 1; if (ch >= '0' && ch <= '9') { ch -= '0'; @@ -675,7 +731,7 @@ decode_quickdump(char *target, const char *source) char *base = target; int result = 0; - if (!strncmp(source, "b64:", 4)) { + if (!strncmp(source, "b64:", (size_t) 4)) { source += 4; while (*source != '\0') { int bits[4]; @@ -693,7 +749,7 @@ decode_quickdump(char *target, const char *source) } } } - } else if (!strncmp(source, "hex:", 4)) { + } else if (!strncmp(source, "hex:", (size_t) 4)) { source += 4; while (*source != '\0') { int ch = decode_hex(&source); @@ -730,10 +786,14 @@ _nc_read_tic_entry(char *filename, (T_CALLED("_nc_read_tic_entry(file=%p, path=%s, name=%s)"), filename, path, name)); + assert(TGETENT_YES == TRUE); /* simplify call for _nc_name_match */ + if ((used = decode_quickdump(buffer, path)) != 0 && (code = _nc_read_termtype(tp, buffer, used)) == TGETENT_YES - && _nc_name_match(tp->term_names, name, "|")) { + && (code = _nc_name_match(tp->term_names, name, "|")) == TGETENT_YES) { TR(TRACE_DATABASE, ("loaded quick-dump for %s", name)); + /* shorten name shown by infocmp */ + _nc_STRCPY(filename, "$TERMINFO", limit); } else #if USE_HASHED_DB if (make_db_filename(filename, limit, path) @@ -743,6 +803,9 @@ _nc_read_tic_entry(char *filename, int reccnt = 0; char *save = strdup(name); + if (save == 0) + returnDB(code); + memset(&key, 0, sizeof(key)); key.data = save; key.size = strlen(save); @@ -752,7 +815,7 @@ _nc_read_tic_entry(char *filename, * looking for compiled (binary) terminfo data. * * cgetent uses a two-level lookup. On the first it uses the given - * name to return a record containing only the aliases for an entry. + * name to return a record containing only the aliases for an entry. * On the second (using that list of aliases as a key), it returns the * content of the terminal description. We expect second lookup to * return data beginning with the same set of aliases. @@ -798,7 +861,7 @@ _nc_read_tic_entry(char *filename, code = _nc_read_file_entry(filename, tp); } #if NCURSES_USE_TERMCAP - else if (code != TGETENT_YES) { + if (code != TGETENT_YES) { code = _nc_read_termcap_entry(name, tp); _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) "%.*s", PATH_MAX - 1, _nc_get_source()); @@ -809,7 +872,7 @@ _nc_read_tic_entry(char *filename, #endif /* NCURSES_USE_DATABASE */ /* - * Find and read the compiled entry for a given terminal type, if it exists. + * Find and read the compiled entry for a given terminal type, if it exists. * We take pains here to make sure no combination of environment variables and * terminal type name can be used to overrun the file buffer. */ @@ -818,6 +881,9 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t { int code = TGETENT_NO; + if (name == 0) + return _nc_read_entry2("", filename, tp); + _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) "%.*s", PATH_MAX - 1, name); @@ -854,9 +920,6 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t } #if NCURSES_EXT_NUMBERS -/* - * This entrypoint is used by tack. - */ NCURSES_EXPORT(int) _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp) {