diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-24 19:47:47 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-24 19:47:47 -0800 |
| commit | 06d8ace51597cd41e110560a56a1abeb6cce23d6 (patch) | |
| tree | e893bab169f27821637fc07e3cd2414b4b9b7b68 /lwlib | |
| parent | c5ecc7690d4afafb42049634d64abd781ff76642 (diff) | |
| parent | 0d19d4feaa653a315853716e64bbaddb210a26ca (diff) | |
| download | emacs-06d8ace51597cd41e110560a56a1abeb6cce23d6.tar.gz | |
Merge from emacs-23.
Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.
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 a0ec95ca3a4..5c5b4fcb975 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,8 @@ +2011-01-25 Werner Meisner <weme24@gmx.net> + + * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference + (Bug#7690). + 2010-09-26 Dan Nicolaescu <dann@ics.uci.edu> Use const for some pointer arguments. diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 60f282e69f4..b6c2ef1b323 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -800,7 +800,7 @@ xm_update_menu (widget_instance* instance, /* 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, |