[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b53045bd68eded9de7192f13acfd261913ece2e3
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 11:48:24 2010 +0000

    2010-10-27  Kimmo Kinnunen  <kimmo.t.kinnunen at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70635 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b257b58..331b407 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-27  Kimmo Kinnunen  <kimmo.t.kinnunen at 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 at gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
index b6610b3..edcfc7a 100644
--- a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
+++ b/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp
@@ -72,8 +72,8 @@ void Connection::readyReadHandler()
         ASSERT_UNUSED(numberOfBytesRead, numberOfBytesRead);
 
         // 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)));
 

-- 
WebKit Debian packaging