ba1c58
From snapshot 6.1-20191012
ba1c58
ba1c58
diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c
ba1c58
index 21f165ca..a62d38f9 100644
ba1c58
--- a/ncurses/tinfo/comp_hash.c
ba1c58
+++ b/ncurses/tinfo/comp_hash.c
ba1c58
@@ -63,7 +63,9 @@ _nc_find_entry(const char *string,
ba1c58
 
ba1c58
     hashvalue = data->hash_of(string);
ba1c58
 
ba1c58
-    if (data->table_data[hashvalue] >= 0) {
ba1c58
+    if (hashvalue >= 0
ba1c58
+	&& (unsigned) hashvalue < data->table_size
ba1c58
+	&& data->table_data[hashvalue] >= 0) {
ba1c58
 
ba1c58
 	real_table = _nc_get_table(termcap);
ba1c58
 	ptr = real_table + data->table_data[hashvalue];
ba1c58
@@ -96,7 +98,9 @@ _nc_find_type_entry(const char *string,
ba1c58
     const HashData *data = _nc_get_hash_info(termcap);
ba1c58
     int hashvalue = data->hash_of(string);
ba1c58
 
ba1c58
-    if (data->table_data[hashvalue] >= 0) {
ba1c58
+    if (hashvalue >= 0
ba1c58
+	&& (unsigned) hashvalue < data->table_size
ba1c58
+	&& data->table_data[hashvalue] >= 0) {
ba1c58
 	const struct name_table_entry *const table = _nc_get_table(termcap);
ba1c58
 
ba1c58
 	ptr = table + data->table_data[hashvalue];