From: Pip Cet <pipcet@protonmail.com>
Date: Mon, 9 Dec 2024 12:48:54 +0000 (+0000)
Subject: Fix occasional crash in lwlib due to uninitialized data
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae8e255b88f62a68a3af29d167c4f6e07ab69fd4;p=emacs.git

Fix occasional crash in lwlib due to uninitialized data

Crash observed on cfarm's cfarm210 machine, which is a Solaris 10 zone
on an M3000 server.

* lwlib/xlwmenu.c (XlwMenuInitialize): Initialize menu.font.

(cherry picked from commit cb288fbcd97deeeb993a7a3de97bdbf5b7dced75)
---

diff --git a/lwlib/ChangeLog.1 b/lwlib/ChangeLog.1
index a033a797387..efec2392ffa 100644
--- a/lwlib/ChangeLog.1
+++ b/lwlib/ChangeLog.1
@@ -1,3 +1,7 @@
+2024-12-09  Pip Cet  <pipcet@protonmail.com>
+
+	* lwlib/xlwmenu.c (XlwMenuInitialize): Initialize menu.font.
+
 2015-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* xlwmenu.c (pop_up_menu): Remove debugging code.
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 33f3fa27033..1198045fe40 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -2120,7 +2120,7 @@ XlwMenuInitialize (Widget request, Widget w, ArgList args, Cardinal *num_args)
 
 #if defined USE_CAIRO || defined HAVE_XFT
   if (openXftFont (mw))
-    ;
+    mw->menu.font = NULL;
   else
 #endif
     {