diff options
| author | Werner Meisner <weme24@gmx.net> | 2011-01-23 16:39:37 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-23 16:39:37 -0500 |
| commit | fdbd21a4827f00949986733c041fa814b1e4d143 (patch) | |
| tree | 7cfc727ce5098f9ae39a6d8acb5695eb271aa80f /lwlib | |
| parent | e6cf7a82721b44da3cda83d7267e400ab6a29b98 (diff) | |
| download | emacs-fdbd21a4827f00949986733c041fa814b1e4d143.tar.gz | |
* lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference (Bug#7690).
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 5 | ||||
| -rw-r--r-- | lwlib/lwlib-Xm.c | 2 |
2 files changed, 6 insertions, 1 deletions
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, |