[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100406: * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference (Bug#7690).

[Chong Yidong]

------------------------------------------------------------
revno: 100406
author: Werner Meisner <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2011-01-23 16:39:37 -0500
message:
  * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference (Bug#7690).
modified:
  lwlib/ChangeLog
  lwlib/lwlib-Xm.c

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2011-01-02 23:50:46 +0000
+++ b/lwlib/ChangeLog   2011-01-23 21:39:37 +0000
@@ -1,3 +1,8 @@
+2011-01-23  Werner Meisner  <address@hidden>
+
+       * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference
+       (Bug#7690).
+
 2010-05-07  Chong Yidong  <address@hidden>
 
        * Version 23.2 released.

=== modified file 'lwlib/lwlib-Xm.c'
--- a/lwlib/lwlib-Xm.c  2011-01-02 23:50:46 +0000
+++ b/lwlib/lwlib-Xm.c  2011-01-23 21:39:37 +0000
@@ -825,7 +825,7 @@
 
   /* 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,