From fdbd21a4827f00949986733c041fa814b1e4d143 Mon Sep 17 00:00:00 2001 From: Werner Meisner Date: Sun, 23 Jan 2011 16:39:37 -0500 Subject: [PATCH] * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference (Bug#7690). --- lwlib/ChangeLog | 5 +++++ lwlib/lwlib-Xm.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference + (Bug#7690). + 2010-05-07 Chong Yidong * 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, -- 2.39.5