From: Pasi Kallinen <paxed@alt.org>
Date: Sat, 22 Jan 2022 19:53:15 +0000 (+0200)
Subject: Fix possibly uninitialized error
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d92d5f22683ec0301e0b7174a0648535a408ddfa;p=nethack

Fix possibly uninitialized error
---

diff --git a/win/curses/cursdial.c b/win/curses/cursdial.c
index 86f2a1356..993f083b4 100644
--- a/win/curses/cursdial.c
+++ b/win/curses/cursdial.c
@@ -373,7 +373,7 @@ curses_ext_cmd(void)
     int ret = -1;
     char cur_choice[BUFSZ];
     int matches = 0;
-    int *ecmatches;
+    int *ecmatches = NULL;
     WINDOW *extwin = NULL, *extwin2 = NULL;
 
     if (iflags.extmenu) {
@@ -421,14 +421,16 @@ curses_ext_cmd(void)
         wclrtoeol(extwin);
 
         /* if we have an autocomplete command, AND it matches uniquely */
-        if (matches == 1) {
+        if (matches == 1 && ecmatches) {
             struct ext_func_tab *ec = extcmds_getentry(ecmatches[0]);
 
-            curses_toggle_color_attr(extwin, NONE, A_UNDERLINE, ON);
-            wmove(extwin, starty, (int) strlen(cur_choice) + startx + 2);
-            wprintw(extwin, "%s",
-                    ec->ef_txt + (int) strlen(cur_choice));
-            curses_toggle_color_attr(extwin, NONE, A_UNDERLINE, OFF);
+            if (ec) {
+                curses_toggle_color_attr(extwin, NONE, A_UNDERLINE, ON);
+                wmove(extwin, starty, (int) strlen(cur_choice) + startx + 2);
+                wprintw(extwin, "%s",
+                        ec->ef_txt + (int) strlen(cur_choice));
+                curses_toggle_color_attr(extwin, NONE, A_UNDERLINE, OFF);
+            }
         }
 
         curs_set(1);
@@ -447,7 +449,7 @@ curses_ext_cmd(void)
             (void) mungspaces(cur_choice);
             if (ret == -1) {
                 matches = extcmds_match(cur_choice, ECM_IGNOREAC|ECM_EXACTMATCH, &ecmatches);
-                if (matches == 1)
+                if (matches == 1 && ecmatches)
                     ret = ecmatches[0];
             }
             break;
@@ -481,7 +483,7 @@ curses_ext_cmd(void)
             ret = -1;
         }
         matches = extcmds_match(cur_choice, ECM_NOFLAGS, &ecmatches);
-        if (matches == 1)
+        if (matches == 1 && ecmatches)
             ret = ecmatches[0];
     }