* lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference (Bug#7690).

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 3260fd188e1327e0bf56d39304b900098b09272f..6244a9b04d6534bf863281aeefa7a4995150871e 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-23  Werner Meisner  <weme24@gmx.net>
+
+       * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference
+       (Bug#7690).
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.2 released.

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 60c64adef41371c00f43c3f7676cbeabcaca0fe4..cd5580c643bfebd2c30fa63556d6bc29eba49ae8 100644 (file)
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -825,7 +825,7 @@ xm_update_menu (instance, widget, val, deep_p)
 
   /* Now replace from scratch all the buttons after the last
      place that the top-level structure changed.  */
-  if (val->contents->change == STRUCTURAL_CHANGE)
+  if (val->contents && val->contents->change == STRUCTURAL_CHANGE)
     {
       destroy_all_children (widget, num_children_to_keep);
       make_menu_in_widget (instance, widget, val->contents,