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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b79f929cce9ad7738fcadb5c556a9fbffdab2aff
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 18:54:58 2010 +0000

    2010-08-26  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            Fix double free (we were passing const memory to a GOwnPtr) by
            getting rid of unneeded temp variable.
    
            * platform/gtk/FileSystemGtk.cpp:
            (WebCore::directoryName):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2c83237..aec46e4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-26  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        Fix double free (we were passing const memory to a GOwnPtr) by
+        getting rid of unneeded temp variable.
+
+        * platform/gtk/FileSystemGtk.cpp:
+        (WebCore::directoryName):
+
 2010-08-26  Mikhail Naganov  <mnaganov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/gtk/FileSystemGtk.cpp b/WebCore/platform/gtk/FileSystemGtk.cpp
index 7ad2a39..6f3fa19 100644
--- a/WebCore/platform/gtk/FileSystemGtk.cpp
+++ b/WebCore/platform/gtk/FileSystemGtk.cpp
@@ -187,8 +187,7 @@ String pathGetFileName(const String& pathName)
 String directoryName(const String& path)
 {
     /* No null checking needed */
-    GOwnPtr<char> tmpFilename(const_cast<char*>(fileSystemRepresentation(path).data()));
-    GOwnPtr<char> dirname(g_path_get_dirname(tmpFilename.get()));
+    GOwnPtr<char> dirname(g_path_get_dirname(fileSystemRepresentation(path).data()));
     return String::fromUTF8(dirname.get());
 }
 

-- 
WebKit Debian packaging