Changeset 93546 in webkit

Timestamp:

Aug 22, 2011 2:46:58 PM (13 years ago)

Author:

msaboff@apple.com

Message:

REGRESSION (r92231): Apple campus proposal PDF doesn't display in Safari
​https://bugs.webkit.org/show_bug.cgi?id=66464

Changed ArgumentEncoder to use system malloc instead of fastMalloc.
FastMalloc uses madvise(MADV_FREE_REUSABLE) which is incompatible with
mach message Out Of Line (OOL) messages that use MACH_MSG_VIRTUAL_COPY.
The system malloc has no such limitation.
Changed sendOutgoingMessage to use MACH_MSG_VIRTUAL_COPY again as it
doesn't have size limitations that MACH_MSG_PHYSICAL_COPY.

Reviewed by Anders Carlsson.

• Platform/CoreIPC/ArgumentEncoder.cpp:

(CoreIPC::ArgumentEncoder::~ArgumentEncoder):
(CoreIPC::ArgumentEncoder::grow):

• Platform/CoreIPC/mac/ConnectionMac.cpp:

(CoreIPC::Connection::sendOutgoingMessage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/ArgumentEncoder.cpp (modified) (2 diffs)
• Platform/CoreIPC/mac/ConnectionMac.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-21  Michael Saboff  <msaboff@apple.com>
+
+        REGRESSION (r92231): Apple campus proposal PDF doesn't display in Safari
+        https://bugs.webkit.org/show_bug.cgi?id=66464
+
+        Changed ArgumentEncoder to use system malloc instead of fastMalloc.
+        FastMalloc uses madvise(MADV_FREE_REUSABLE) which is incompatible with
+        mach message Out Of Line (OOL) messages that use MACH_MSG_VIRTUAL_COPY.
+        The system malloc has no such limitation.
+        Changed sendOutgoingMessage to use MACH_MSG_VIRTUAL_COPY again as it 
+        doesn't have size limitations that MACH_MSG_PHYSICAL_COPY.
+        
+        Reviewed by Anders Carlsson.
+
+        * Platform/CoreIPC/ArgumentEncoder.cpp:
+        (CoreIPC::ArgumentEncoder::~ArgumentEncoder):
+        (CoreIPC::ArgumentEncoder::grow):
+        * Platform/CoreIPC/mac/ConnectionMac.cpp:
+        (CoreIPC::Connection::sendOutgoingMessage):
+
 2011-08-22  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp

@@ -51 +51 @@
 {
     if (m_buffer)
-        fastFree(m_buffer);
+        free(m_buffer);
 #if !USE(UNIX_DOMAIN_SOCKETS)
     // FIXME: We need to dispose of the attachments in cases of failure.
@@ -71 +71 @@
     if (alignedSize + size > m_bufferCapacity) {
         size_t newCapacity = std::max(alignedSize + size, std::max(static_cast<size_t>(32), m_bufferCapacity + m_bufferCapacity / 4 + 1));
+        // Use system malloc / realloc instead of fastMalloc due to 
+        // fastMalloc using MADV_FREE_REUSABLE doesn't work with
+        // mach messages with OOL message and MACH_MSG_VIRTUAL_COPY.
         if (!m_buffer)
-            m_buffer = static_cast<uint8_t*>(fastMalloc(newCapacity));
+            m_buffer = static_cast<uint8_t*>(malloc(newCapacity));
         else
-            m_buffer = static_cast<uint8_t*>(fastRealloc(m_buffer, newCapacity));
+            m_buffer = static_cast<uint8_t*>(realloc(m_buffer, newCapacity));
         
         // FIXME: What should we do if allocating memory fails?

trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp

@@ -156 +156 @@
         messageBodyIsOOL = true;
 
-        attachments.append(Attachment(arguments->buffer(), arguments->bufferSize(), MACH_MSG_PHYSICAL_COPY, false));
+        attachments.append(Attachment(arguments->buffer(), arguments->bufferSize(), MACH_MSG_VIRTUAL_COPY, false));
         numberOfOOLMemoryDescriptors++;
         messageSize = machMessageSize(0, numberOfPortDescriptors, numberOfOOLMemoryDescriptors);