From 3075dac106a551591363e3f84026697c41a94a2a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 21 Dec 2015 12:53:05 -0500 Subject: [PATCH] image: Don't assume baseline parameters are non-NULL 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. --- gtk/gtkimage.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index c9b454c737..f9bd7e15eb 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -1694,7 +1694,10 @@ gtk_image_get_content_size (GtkCssGadget *gadget, { baseline_align = gtk_image_get_baseline_align (GTK_IMAGE (widget)); *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; } }