diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2014-05-01 19:43:20 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2014-05-01 19:44:12 +0200 |
| commit | 7f60cab47d9651ed3ed53b86f1f74de71b55eee0 (patch) | |
| tree | ec252e1637fcfe87d8c01392da42a4137fff276d /gtk/gtkcombobox.c | |
| parent | 489970bcdc15eaa78286d560fa2bf30a45b87eb6 (diff) | |
| download | gtk+-7f60cab47d9651ed3ed53b86f1f74de71b55eee0.tar.gz | |
combobox: fix a segfault
Don't dereference a NULL pointer.
Diffstat (limited to 'gtk/gtkcombobox.c')
| -rw-r--r-- | gtk/gtkcombobox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index c67912f611..557160482a 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -5602,11 +5602,11 @@ gtk_combo_box_get_preferred_height (GtkWidget *widget, gint *minimum_size, gint *natural_size) { - gint min_width; + gint min_width, nat_width; /* Combo box is height-for-width only * (so we always just reserve enough height for the minimum width) */ - GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, &min_width, NULL); + GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, &min_width, &nat_width); GTK_WIDGET_GET_CLASS (widget)->get_preferred_height_for_width (widget, min_width, minimum_size, natural_size); } |