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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 72f2bb12362e26415746c566bb80573fa47428fd
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 21:34:01 2010 +0000

    2010-08-26   Stanislav Brabec  <sbrabec at suse.cz>
    
            Reviewed by Martin Robinson.
    
            [GTK] [PATCH] plugin loading invalid symlink evaluation deadlock
            https://bugs.webkit.org/show_bug.cgi?id=44683
    
            Fix symlink resolution in PluginPackageGtk.
    
            * plugins/gtk/PluginPackageGtk.cpp:
            (WebCore::PluginPackage::load): g_file_resolve_relative_path must be called with a
            a directory, not a file.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 28bb1a4..8239db1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-26   Stanislav Brabec  <sbrabec at suse.cz>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] [PATCH] plugin loading invalid symlink evaluation deadlock
+        https://bugs.webkit.org/show_bug.cgi?id=44683
+
+        Fix symlink resolution in PluginPackageGtk.
+
+        * plugins/gtk/PluginPackageGtk.cpp:
+        (WebCore::PluginPackage::load): g_file_resolve_relative_path must be called with a
+        a directory, not a file.
+
 2010-08-26  Andy Estes  <aestes at apple.com>
 
         Reviewed by Eric Carlson.
diff --git a/WebCore/plugins/gtk/PluginPackageGtk.cpp b/WebCore/plugins/gtk/PluginPackageGtk.cpp
index 97553a1..d0218fb 100644
--- a/WebCore/plugins/gtk/PluginPackageGtk.cpp
+++ b/WebCore/plugins/gtk/PluginPackageGtk.cpp
@@ -113,9 +113,9 @@ bool PluginPackage::load()
     GOwnPtr<gchar> finalPath(g_strdup(m_path.utf8().data()));
     while (g_file_test(finalPath.get(), G_FILE_TEST_IS_SYMLINK)) {
         GOwnPtr<GFile> file(g_file_new_for_path(finalPath.get()));
+        GOwnPtr<GFile> dir(g_file_get_parent(file.get()));
         GOwnPtr<gchar> linkPath(g_file_read_link(finalPath.get(), 0));
-
-        GOwnPtr<GFile> resolvedFile(g_file_resolve_relative_path(file.get(), linkPath.get()));
+        GOwnPtr<GFile> resolvedFile(g_file_resolve_relative_path(dir.get(), linkPath.get()));
         finalPath.set(g_file_get_path(resolvedFile.get()));
     }
 

-- 
WebKit Debian packaging