diff options
| author | Pip Cet | 2024-12-09 12:48:54 +0000 |
|---|---|---|
| committer | Pip Cet | 2024-12-09 13:06:40 +0000 |
| commit | cb288fbcd97deeeb993a7a3de97bdbf5b7dced75 (patch) | |
| tree | 2fe810a4bb5309efb9b4c58c39680d5143675413 /lwlib | |
| parent | 6df535788a20c9047d33dd8a0c62258597632647 (diff) | |
| download | emacs-cb288fbcd97deeeb993a7a3de97bdbf5b7dced75.tar.gz emacs-cb288fbcd97deeeb993a7a3de97bdbf5b7dced75.zip | |
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.
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog.1 | 4 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ | |||
| 1 | 2024-12-09 Pip Cet <pipcet@protonmail.com> | ||
| 2 | |||
| 3 | * lwlib/xlwmenu.c (XlwMenuInitialize): Initialize menu.font. | ||
| 4 | |||
| 1 | 2015-03-18 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2015-03-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * xlwmenu.c (pop_up_menu): Remove debugging code. | 7 | * 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) | |||
| 2120 | 2120 | ||
| 2121 | #if defined USE_CAIRO || defined HAVE_XFT | 2121 | #if defined USE_CAIRO || defined HAVE_XFT |
| 2122 | if (openXftFont (mw)) | 2122 | if (openXftFont (mw)) |
| 2123 | ; | 2123 | mw->menu.font = NULL; |
| 2124 | else | 2124 | else |
| 2125 | #endif | 2125 | #endif |
| 2126 | { | 2126 | { |