[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 d4cb67830cebf6f2596a9ea606108b9d3a78b962
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 12:53:41 2010 +0000

    2010-11-09  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):
            Follow up fix: do not access the QSharedMemory object
            in an assert if it has been deleted.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71624 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ea22552..cfa281b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-09  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):
+        Follow up fix: do not access the QSharedMemory object
+        in an assert if it has been deleted.
+
 2010-11-08  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit2/Platform/qt/SharedMemoryQt.cpp b/WebKit2/Platform/qt/SharedMemoryQt.cpp
index 537d43c..ca997c5 100644
--- a/WebKit2/Platform/qt/SharedMemoryQt.cpp
+++ b/WebKit2/Platform/qt/SharedMemoryQt.cpp
@@ -145,12 +145,12 @@ PassRefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection p
 
 SharedMemory::~SharedMemory()
 {
-    // m_impl must be non-null and it must point to a valid QSharedMemory object.
-    ASSERT(qobject_cast<QSharedMemory*>(m_impl));
-
     // Avoid double deletion when deleteLater has already been called through the signal-slot connection.
-    if (QCoreApplication::instance()->disconnect(m_impl))
+    if (QCoreApplication::instance()->disconnect(m_impl)) {
+        // m_impl must be non-null and it must point to a valid QSharedMemory object.
+        ASSERT(qobject_cast<QSharedMemory*>(m_impl));
         delete m_impl;
+    }
 
     CrashHandler::instance()->didDelete(m_impl);
 }

-- 
WebKit Debian packaging