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 a033a797387ca992388ab871b84316f61dfd438d..efec2392ffac6b385a3f795c8667cbe202fbb052 100644 (file)
--- 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 33f3fa2703316f6ef229ef3c6daff2ded297c7c4..1198045fe408b84d5e2b89073830f317f0dae568 100644 (file)
--- 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
     {