[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 ab9601cf9fcc29901172ef0c10f7530432934420
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 14:52:05 2010 +0000

    2010-10-28  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt][WK2] SharedMemory should be released by the receiving process
            https://bugs.webkit.org/show_bug.cgi?id=48520
    
            * Platform/qt/SharedMemoryQt.cpp:
            (WebKit::SharedMemory::~SharedMemory):
            (WebKit::SharedMemory::createHandle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6adc728..8ab62ff 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-28  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][WK2] SharedMemory should be released by the receiving process
+        https://bugs.webkit.org/show_bug.cgi?id=48520
+
+        * Platform/qt/SharedMemoryQt.cpp:
+        (WebKit::SharedMemory::~SharedMemory):
+        (WebKit::SharedMemory::createHandle):
+
 2010-10-28  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
 
          Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/Platform/qt/SharedMemoryQt.cpp b/WebKit2/Platform/qt/SharedMemoryQt.cpp
index fa19c0f..1c5959d 100644
--- a/WebKit2/Platform/qt/SharedMemoryQt.cpp
+++ b/WebKit2/Platform/qt/SharedMemoryQt.cpp
@@ -122,6 +122,11 @@ PassRefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection p
 
 SharedMemory::~SharedMemory()
 {
+    if (!m_data) {
+        // Ownership of the mapped memory has been passed.
+        return;
+    }
+
     MappedMemory* mappedMemory = mappedMemoryPool->searchForMappedMemory(reinterpret_cast<uchar*>(m_data));
     if (mappedMemory)
         mappedMemory->markFree();
@@ -140,6 +145,9 @@ bool SharedMemory::createHandle(Handle& handle, Protection protection)
     handle.m_fileName = mm->file->fileName();
     handle.m_size = m_size;
 
+    // Hand off ownership of the mapped memory to the receiving process.
+    m_data = 0;
+
     return true;
 }
 

-- 
WebKit Debian packaging