From: Werner Meisner <weme24@gmx.net>
Date: Sun, 23 Jan 2011 21:39:37 +0000 (-0500)
Subject: * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference (Bug#7690).
X-Git-Tag: emacs-pretest-23.2.93~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fdbd21a4827f00949986733c041fa814b1e4d143;p=emacs.git

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

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 3260fd188e1..6244a9b04d6 100644
--- 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 60c64adef41..cd5580c643b 100644
--- 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,