emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master cb288fbcd97: Fix occasional crash in lwlib due to uninitialized d


From: Pip Cet
Subject: master cb288fbcd97: Fix occasional crash in lwlib due to uninitialized data
Date: Mon, 9 Dec 2024 08:09:09 -0500 (EST)

branch: master
commit cb288fbcd97deeeb993a7a3de97bdbf5b7dced75
Author: Pip Cet <pipcet@protonmail.com>
Commit: Pip Cet <pipcet@protonmail.com>

    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.
---
 lwlib/ChangeLog.1 | 4 ++++
 lwlib/xlwmenu.c   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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
     {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]