[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

sergio at webkit.org sergio at webkit.org
Wed Dec 22 18:01:54 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 83e2e1819e0518779a91d558529872168dc401dd
Author: sergio at webkit.org <sergio at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 6 12:24:32 2010 +0000

    2010-12-06  Sergio Villar Senin  <svillar at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Leak in webkit_soup_cache_load if file contents load fails
            https://bugs.webkit.org/show_bug.cgi?id=50558
    
            g_file_get_contents() could return an error after allocating a
            buffer for file contents. We must free that memory before
            returning.
    
            * platform/network/soup/cache/webkit/soup-cache.c:
            (webkit_soup_cache_load): Added a missing g_free().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73356 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1297e56..07aba96 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-06  Sergio Villar Senin  <svillar at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Leak in webkit_soup_cache_load if file contents load fails
+        https://bugs.webkit.org/show_bug.cgi?id=50558
+
+        g_file_get_contents() could return an error after allocating a
+        buffer for file contents. We must free that memory before
+        returning.
+
+        * platform/network/soup/cache/webkit/soup-cache.c:
+        (webkit_soup_cache_load): Added a missing g_free().
+
 2010-12-06  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r73351.
diff --git a/WebCore/platform/network/soup/cache/webkit/soup-cache.c b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
index a7937dd..b96428d 100644
--- a/WebCore/platform/network/soup/cache/webkit/soup-cache.c
+++ b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
@@ -1615,6 +1615,7 @@ webkit_soup_cache_load (WebKitSoupCache *cache)
 	filename = g_build_filename (priv->cache_dir, WEBKIT_SOUP_CACHE_FILE, NULL);
 	if (!g_file_get_contents (filename, &contents, &length, NULL)) {
 		g_free (filename);
+		g_free (contents);
 		return;
 	}
 	g_free (filename);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list