AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-19 09:50:06 +00:00
Code Issues Projects Releases Wiki Activity

GtkFlowBox: fixed NULL dereferencing segfaults

Browse Source
This commit is contained in:
Juan Pablo Ugarte 2014-05-01 20:31:59 -03:00
parent a05b55872b
commit 35df3bc182
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkflowbox.c
View File

@ -2093,9 +2093,9 @@ gtk_flow_box_get_preferred_width (GtkWidget *widget,
else /* GTK_ORIENTATION_VERTICAL */ else /* GTK_ORIENTATION_VERTICAL */
{ {
/* Return the width for the minimum height */ /* Return the width for the minimum height */
gint min_height; gint min_height, nat_height;
GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, &min_height, NULL); GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, &min_height, &nat_height);
GTK_WIDGET_GET_CLASS (widget)->get_preferred_width_for_height (widget, GTK_WIDGET_GET_CLASS (widget)->get_preferred_width_for_height (widget,
min_height, min_height,
&min_width, &min_width,
@ -2127,9 +2127,9 @@ gtk_flow_box_get_preferred_height (GtkWidget *widget,
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
/* Return the height for the minimum width */ /* Return the height for the minimum width */
gint min_width; gint min_width, nat_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, GTK_WIDGET_GET_CLASS (widget)->get_preferred_height_for_width (widget,
min_width, min_width,
&min_height, &min_height,
@ -2218,7 +2218,7 @@ gtk_flow_box_get_preferred_height_for_width (GtkWidget *widget,
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
gint min_width; gint min_width, nat_width;
gint line_length; gint line_length;
gint item_size, extra_pixels; gint item_size, extra_pixels;
@ -2227,7 +2227,7 @@ gtk_flow_box_get_preferred_height_for_width (GtkWidget *widget,
goto out; goto out;
/* Make sure its no smaller than the minimum */ /* Make sure its no smaller than the minimum */
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);
avail_size = MAX (width, min_width); avail_size = MAX (width, min_width);
if (avail_size <= 0) if (avail_size <= 0)
@ -2384,7 +2384,7 @@ gtk_flow_box_get_preferred_width_for_height (GtkWidget *widget,
} }
else /* GTK_ORIENTATION_VERTICAL */ else /* GTK_ORIENTATION_VERTICAL */
{ {
gint min_height; gint min_height, nat_height;
gint line_length; gint line_length;
gint item_size, extra_pixels; gint item_size, extra_pixels;
@ -2393,7 +2393,7 @@ gtk_flow_box_get_preferred_width_for_height (GtkWidget *widget,
goto out; goto out;
/* Make sure its no smaller than the minimum */ /* Make sure its no smaller than the minimum */
GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, &min_height, NULL); GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, &min_height, &nat_height);
avail_size = MAX (height, min_height); avail_size = MAX (height, min_height);
if (avail_size <= 0) if (avail_size <= 0)