From f30eab099bdc4044738c6df77fa6088abc666961 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sun, 8 Jul 2012 00:27:30 -0400 Subject: [PATCH] entry: guard for != NULL before unreffing the pixbuf In gtk_entry_get_icon_pixbuf() we unreference the pixbuf that _gtk_icon_helper_ensure_pixbuf() gives us back, since the function doesn't return a reference, and by doing so we're able to return the reference owned by the cached icon helper. Since the icon helper method can return NULL though, if no icon properties have been set on it, guard for != NULL before unreffing the pixbuf, as that would cause a critical warning. https://bugzilla.gnome.org/show_bug.cgi?id=679537 --- gtk/gtkentry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index ef58c2e33..db83f058d 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -7946,7 +7946,8 @@ gtk_entry_get_icon_pixbuf (GtkEntry *entry, * the icon helper's cache ref directly. */ pixbuf = gtk_entry_ensure_pixbuf (entry, icon_pos); - g_object_unref (pixbuf); + if (pixbuf) + g_object_unref (pixbuf); return pixbuf; } -- 2.43.2