From 190cbfa2b7315cb182013c22ae899c07548f2bd1 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Mon, 6 Apr 2026 11:50:18 +0300
Subject: [PATCH] Fix segfault when binding keys in-game

---
 src/cmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cmd.c b/src/cmd.c
index 8b34060b6..8457f8b14 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -2297,7 +2297,6 @@ handler_rebind_keys_add(boolean keyfirst)
     char buf2[QBUFSZ];
     uchar key = '\0';
     int clr = NO_COLOR;
-    struct Cmd_bind *bind;
 
     if (keyfirst) {
         pline("Bind which key? ");
@@ -2312,8 +2311,9 @@ handler_rebind_keys_add(boolean keyfirst)
     any = cg.zeroany;
 
     if (key) {
-        bind = cmdbind_get(key);
-        if (bind) {
+        struct Cmd_bind *bind = cmdbind_get(key);
+
+        if (bind && bind->cmd) {
             Sprintf(buf, "Key '%s' is currently bound to \"%s\".",
                     key2txt(key, buf2), bind->cmd->ef_txt);
         } else {