ncurses 6.5 - patch 20240504

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

diff --git a/ncurses/tinfo/init_keytry.c b/ncurses/tinfo/init_keytry.c
index ea47b382b493343aca389f4cd3a39b8e33c7e26d..ef20dfb1da08539dcead9a7748d2b134ed32b38b 100644 (file)
--- a/ncurses/tinfo/init_keytry.c
+++ b/ncurses/tinfo/init_keytry.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1999-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 1999-2010,2016 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            *
@@ -29,7 +30,7 @@
 #include <curses.priv.h>
 #include <tic.h>               /* struct tinfo_fkeys */
 
-MODULE_ID("$Id: init_keytry.c,v 1.17 2010/04/24 22:29:56 tom Exp $")
+MODULE_ID("$Id: init_keytry.c,v 1.20 2023/09/16 12:55:01 tom Exp $")
 
 /*
 **      _nc_init_keytry()
@@ -66,7 +67,7 @@ _nc_tinfo_fkeysf(void)
 NCURSES_EXPORT(void)
 _nc_init_keytry(SCREEN *sp)
 {
-    unsigned n;
+    T(("_nc_init_keytry(%p)", (void *) sp));
 
     /* The sp->_keytry value is initialized in newterm(), where the sp
      * structure is created, because we can not tell where keypad() or
@@ -74,6 +75,8 @@ _nc_init_keytry(SCREEN *sp)
      */
 
     if (sp != 0) {
+       unsigned n;
+
        for (n = 0; _nc_tinfo_fkeys[n].code; n++) {
            if (_nc_tinfo_fkeys[n].offset < STRCOUNT) {
                (void) _nc_add_to_try(&(sp->_keytry),
@@ -94,7 +97,7 @@ _nc_init_keytry(SCREEN *sp)
                char *value = tp->Strings[n];
                if (name != 0
                    && *name == 'k'
-                   && value != 0
+                   && VALID_STRING(value)
                    && NCURSES_SP_NAME(key_defined) (NCURSES_SP_ARGx
                                                     value) == 0) {
                    (void) _nc_add_to_try(&(sp->_keytry),