[Xfce4-commits] <midori:master> Don't leak temporary icon filename and don't free icon URI too early

[Christian Dywan]

Updating branch refs/heads/master
         to b7fd68c1734318deb6c6809d98a2583ce70acfb4 (commit)
       from 97a5eb0df2b48bfb0c359fb7abc6ee8f0b970238 (commit)

commit b7fd68c1734318deb6c6809d98a2583ce70acfb4
Author: Can Erkin Acar <canacar at openbsd.org>
Date:   Tue Jan 19 06:09:05 2010 +0100

    Don't leak temporary icon filename and don't free icon URI too early

 katze/katze-utils.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index 86a7f90..58bcadd 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -1457,17 +1457,18 @@ katze_load_cached_icon (const gchar* uri,
             i++;
         if (uri[i] == '/')
         {
-            icon_uri = g_strdup (uri);
-            icon_uri[i] = '\0';
-            icon_uri = g_strdup_printf ("%s/favicon.ico", icon_uri);
+            gchar* ticon_uri = g_strdup (uri);
+            ticon_uri[i] = '\0';
+            icon_uri = g_strdup_printf ("%s/favicon.ico", ticon_uri);
+            g_free (ticon_uri);
         }
         else
             icon_uri = g_strdup_printf ("%s/favicon.ico", uri);
 
         checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, icon_uri, -1);
         ext = g_strrstr (icon_uri, ".");
-        g_free (icon_uri);
         filename = g_strdup_printf ("%s%s", checksum, ext ? ext : "");
+        g_free (icon_uri);
         g_free (checksum);
         path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME,
                                  "icons", filename, NULL);