summaryrefslogtreecommitdiff
path: root/gtk/gtkmenu.c
diff options
context:
space:
mode:
authorJuan Pablo Ugarte <juanpablougarte@gmail.com>2014-05-01 20:31:31 -0300
committerJuan Pablo Ugarte <juanpablougarte@gmail.com>2014-05-01 20:31:31 -0300
commita05b55872b6b24cf65d1f25f24b7389c59347ddb (patch)
treeb3ef72be1fb4b833f7eba58e552ed6fcec822b58 /gtk/gtkmenu.c
parent018c394c5200ef468d6bb721aa6b467d9fdffd50 (diff)
downloadgtk+-a05b55872b6b24cf65d1f25f24b7389c59347ddb.tar.gz
GtkMenu: fixed more NULL dereferencing segfault
Diffstat (limited to 'gtk/gtkmenu.c')
-rw-r--r--gtk/gtkmenu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index e011e953c1..f29ac125cf 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -3267,12 +3267,12 @@ gtk_menu_get_preferred_height (GtkWidget *widget,
gint *minimum_size,
gint *natural_size)
{
- gint min_width;
+ gint min_width, nat_width;
/* Menus are height-for-width only, just return the 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);
}