Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image: Don't assume baseline parameters are non-NULL

Browse Source 
The GetSize callback *can* assume that minimum and natural are
non-NULL. Buy minimum_baseline and natural_baseline can and
will be NULL, so handle that. This was causing crashes e.g. in
pavucontrol.
This commit is contained in:
Matthias Clasen
2015-12-21 12:53:05 -05:00
parent 485c28d300
commit 3075dac106
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkimage.c
View File

@@ -1694,7 +1694,10 @@ gtk_image_get_content_size (GtkCssGadget *gadget,
{ {
baseline_align = gtk_image_get_baseline_align (GTK_IMAGE (widget)); baseline_align = gtk_image_get_baseline_align (GTK_IMAGE (widget));
*minimum = *natural = height; *minimum = *natural = height;
*minimum_baseline = *natural_baseline = height * baseline_align; if (minimum_baseline)
*minimum_baseline = height * baseline_align;
if (natural_baseline)
*natural_baseline = height * baseline_align;
} }
} }