From d63dd43c9b9a1cc24b268829ff0f306a3430a81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Sun, 5 Jan 2025 00:36:54 -0500
Subject: [PATCH] Prevent dereferencing NULL bar or cur with WIN_DYN
This would be an API violation, but we shouldn't crash about it.
---
src/uifc/uifc32.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/uifc/uifc32.c b/src/uifc/uifc32.c
index 60ed5cac65..c1c7058e9c 100644
--- a/src/uifc/uifc32.c
+++ b/src/uifc/uifc32.c
@@ -1890,8 +1890,14 @@ int ulist(uifc_winmode_t mode, int left, int top, int width, int *cur, int *bar
else
mswait(1);
if(mode&WIN_DYN) {
- save_menu_cur=*cur;
- save_menu_bar=*bar;
+ if (cur)
+ save_menu_cur=*cur;
+ else
+ save_menu_cur = -1;
+ if (bar)
+ save_menu_bar=*bar;
+ else
+ save_menu_bar=-1;
save_menu_opts=opts;
return(-2-gotkey);
}
--
GitLab