From 0d879c2aae651e13e6d2dd0ea51aba172d91cbdc Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Fri, 21 Sep 2012 10:34:17 +0200
Subject: [PATCH] app: plug string leak in gimp_image_format_display_uri()
 (cherry picked from commit 7597b83bd8cb10c57986692098347dd285862c3e)

---
 app/core/gimpimage.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index ee3e114dfa..6c81be6274 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -1754,6 +1754,7 @@ gimp_image_format_display_uri (GimpImage *image,
   gboolean     is_exported;
   gchar       *display_uri   = NULL;
   gchar       *format_string;
+  gchar       *tmp;
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
 
@@ -1812,19 +1813,23 @@ gimp_image_format_display_uri (GimpImage *image,
     }
   else if (basename)
     {
-      gchar *tmp = file_utils_uri_display_basename (display_uri);
+      tmp = file_utils_uri_display_basename (display_uri);
       g_free (display_uri);
       display_uri = tmp;
     }
   else
     {
-      gchar *tmp = file_utils_uri_display_name (display_uri);
+      tmp = file_utils_uri_display_name (display_uri);
       g_free (display_uri);
       display_uri = tmp;
     }
 
   format_string = g_strconcat (uri_format, export_status, NULL);
-  display_uri = g_strdup_printf (format_string, display_uri);
+
+  tmp = g_strdup_printf (format_string, display_uri);
+  g_free (display_uri);
+  display_uri = tmp;
+
   g_free (format_string);
 
   return display_uri;