Changeset 70776 in webkit

Timestamp:

Oct 28, 2010 7:52:05 AM (13 years ago)

Author:

kbalazs@webkit.org

Message:

2010-10-28 Balazs Kelemen <​kbalazs@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):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/qt/SharedMemoryQt.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-28  Balazs Kelemen  <kbalazs@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@nokia.com>
 

trunk/WebKit2/Platform/qt/SharedMemoryQt.cpp

@@ -123 +123 @@
 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)
@@ -141 +146 @@
     handle.m_size = m_size;
 
+    // Hand off ownership of the mapped memory to the receiving process.
+    m_data = 0;
+
     return true;
 }