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

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4c25eb1d51830457caf6c77896d5329c197b44f1
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 7 01:23:39 2010 +0000

    2010-11-06  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt][WK2] WebKitTestRunner is dead
            https://bugs.webkit.org/show_bug.cgi?id=49129
    
            * Platform/qt/SharedMemoryQt.cpp:
            (WebKit::SharedMemory::~SharedMemory):
            Avoid double deletion when deleteLater has
            already been called.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71471 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 119adae..248cfcc 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-06  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][WK2] WebKitTestRunner is dead
+        https://bugs.webkit.org/show_bug.cgi?id=49129
+
+        * Platform/qt/SharedMemoryQt.cpp:
+        (WebKit::SharedMemory::~SharedMemory):
+        Avoid double deletion when deleteLater has
+        already been called.
+
 2010-11-05  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit2/Platform/qt/SharedMemoryQt.cpp b/WebKit2/Platform/qt/SharedMemoryQt.cpp
index 13ea4be..537d43c 100644
--- a/WebKit2/Platform/qt/SharedMemoryQt.cpp
+++ b/WebKit2/Platform/qt/SharedMemoryQt.cpp
@@ -147,7 +147,11 @@ SharedMemory::~SharedMemory()
 {
     // m_impl must be non-null and it must point to a valid QSharedMemory object.
     ASSERT(qobject_cast<QSharedMemory*>(m_impl));
-    delete m_impl;
+
+    // Avoid double deletion when deleteLater has already been called through the signal-slot connection.
+    if (QCoreApplication::instance()->disconnect(m_impl))
+        delete m_impl;
+
     CrashHandler::instance()->didDelete(m_impl);
 }
 

-- 
WebKit Debian packaging