Changeset 148043 in webkit

Timestamp:

Apr 9, 2013 1:35:22 PM (11 years ago)

Author:

andersca@apple.com

Message:

If we fail to decode a message name, pass the message length as the name
​https://bugs.webkit.org/show_bug.cgi?id=114305
<rdar://problem/13605703>

Reviewed by Sam Weinig.

• Platform/CoreIPC/ArgumentDecoder.h:

(CoreIPC::ArgumentDecoder::length):

• Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::processIncomingMessage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/ArgumentDecoder.h (modified) (1 diff)
• Platform/CoreIPC/Connection.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-09  Anders Carlsson  <andersca@apple.com>
+
+        If we fail to decode a message name, pass the message length as the name
+        https://bugs.webkit.org/show_bug.cgi?id=114305
+        <rdar://problem/13605703>
+
+        Reviewed by Sam Weinig.
+
+        * Platform/CoreIPC/ArgumentDecoder.h:
+        (CoreIPC::ArgumentDecoder::length):
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::processIncomingMessage):
+
 2013-04-08  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h

@@ -43 +43 @@
 
     uint64_t destinationID() const { return m_destinationID; }
+    size_t length() const { return m_bufferEnd - m_buffer; }
 
     bool isInvalid() const { return m_bufferPos > m_bufferEnd; }

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

@@ -31 +31 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/HashSet.h>
+#include <wtf/text/WTFString.h>
 
 using namespace WebCore;
@@ -620 +621 @@
 
     if (!m_workQueueMessageReceivers.isValidKey(message->messageReceiverName())) {
+        if (message->messageReceiverName().isEmpty() && message->messageName().isEmpty()) {
+            // Something went wrong when decoding the message. Encode the message length so we can figure out if this
+            // happens for certain message lengths.
+            CString messageReceiverName = "<unknown message>";
+            CString messageName = String::format("<message length: %zu bytes>", incomingMessage->length()).utf8();
+
+            m_clientRunLoop->dispatch(bind(&Connection::dispatchDidReceiveInvalidMessage, this, messageReceiverName, messageName));
+            return;
+        }
+
         m_clientRunLoop->dispatch(bind(&Connection::dispatchDidReceiveInvalidMessage, this, message->messageReceiverName().toString(), message->messageName().toString()));
         return;