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

fdbd21a4 · Werner Meisner · Chong Yidong · e6cf7a82 · fdbd21a4 · fdbd21a4
Commit fdbd21a4 authored Jan 23, 2011 by Werner Meisner Committed by Chong Yidong Jan 23, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lwlib/ChangeLog lwlib/ChangeLog +5 -0

lwlib/lwlib-Xm.c lwlib/lwlib-Xm.c +1 -1

No files found.
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
+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.

--- 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,