Changeset 70635 in webkit

Timestamp:

Oct 27, 2010 4:48:24 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-27 Kimmo Kinnunen <​kimmo.t.kinnunen@nokia.com>

Reviewed by Andreas Kling.

[Qt] Type mismatch while serializing/deserializing message id size
​https://bugs.webkit.org/show_bug.cgi?id=48401

Use correct types when reading data from connection buffer.

The message id is written as uint32_t, thus the buffer size should be
calculated based on sizeof(uint32_t) and not sizeof(MessageID).

• Platform/CoreIPC/qt/ConnectionQt.cpp: (CoreIPC::Connection::readyReadHandler):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/qt/ConnectionQt.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-27  Kimmo Kinnunen  <kimmo.t.kinnunen@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Type mismatch while serializing/deserializing message id size
+        https://bugs.webkit.org/show_bug.cgi?id=48401
+
+        Use correct types when reading data from connection buffer.
+
+        The message id is written as uint32_t, thus the buffer size should be
+        calculated based on sizeof(uint32_t) and not sizeof(MessageID).
+
+        * Platform/CoreIPC/qt/ConnectionQt.cpp:
+        (CoreIPC::Connection::readyReadHandler):
+
 2010-10-27  Zalan Bujtas  <zbujtas@gmail.com>
 

trunk/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp

@@ -73 +73 @@
 
         // The messageID is encoded at the end of the buffer.
-        size_t realBufferSize = m_currentMessageSize - sizeof(MessageID);
-        unsigned messageID = *reinterpret_cast<unsigned*>(m_readBuffer.data() + realBufferSize);
+        size_t realBufferSize = m_currentMessageSize - sizeof(uint32_t);
+        uint32_t messageID = *reinterpret_cast<uint32_t*>(m_readBuffer.data() + realBufferSize);
 
         processIncomingMessage(MessageID::fromInt(messageID), adoptPtr(new ArgumentDecoder(m_readBuffer.data(), realBufferSize)));