From 3c41d4865e230f41a3f4cb5f72e438a0788c7bb3 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 15 Oct 2013 08:04:25 -0400
Subject: [PATCH] Fix a crash in icon handling

The load_error was freed in two places.
Fix based on a patch in
https://bugzilla.gnome.org/show_bug.cgi?id=709967
---
 gtk/gtkicontheme.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index d912687b2b..fdec09199f 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3873,12 +3873,17 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
   if (!icon_info_ensure_scale_and_pixbuf (icon_info, FALSE))
     {
       if (icon_info->load_error)
-        g_propagate_error (error, icon_info->load_error);
+        {
+          if (*error)
+            *error = g_error_copy (icon_info->load_error);
+        }
       else
-        g_set_error_literal (error,  
-                             GTK_ICON_THEME_ERROR,  
-                             GTK_ICON_THEME_NOT_FOUND,
-                             _("Failed to load icon"));
+        {
+          g_set_error_literal (error,  
+                               GTK_ICON_THEME_ERROR,  
+                               GTK_ICON_THEME_NOT_FOUND,
+                               _("Failed to load icon"));
+        }
  
       return NULL;
     }