Attachment #71993 for bug #48401

View Details Raw Unified Return to Bug 48401



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

        Reviewed by NOBODY (OOPS!).

        [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-26  Brent Fulgham  <bfulgham@webkit.org>

        Unreviewed build fix.



        ASSERT_UNUSED(numberOfBytesRead, numberOfBytesRead);

        // The messageID is encoded at the end of the buffer.
        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)));


Return to Bug 48401

Lines 72-79 void Connection::readyReadHandler() a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp_sec1
- a/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp -2 / +2 lines
72	ASSERT_UNUSED(numberOfBytesRead, numberOfBytesRead);	72	ASSERT_UNUSED(numberOfBytesRead, numberOfBytesRead);
73		73
74	// The messageID is encoded at the end of the buffer.	74	// The messageID is encoded at the end of the buffer.
75	size_t realBufferSize = m_currentMessageSize - sizeof(MessageID);	75	size_t realBufferSize = m_currentMessageSize - sizeof(uint32_t);
76	unsigned messageID = reinterpret_cast<unsigned>(m_readBuffer.data() + realBufferSize);	76	uint32_t messageID = reinterpret_cast<uint32_t>(m_readBuffer.data() + realBufferSize);
77		77
78	processIncomingMessage(MessageID::fromInt(messageID), adoptPtr(new ArgumentDecoder(m_readBuffer.data(), realBufferSize)));	78	processIncomingMessage(MessageID::fromInt(messageID), adoptPtr(new ArgumentDecoder(m_readBuffer.data(), realBufferSize)));
79		79

Lines 1-3 a/WebKit2/ChangeLog_sec1
- a/WebKit2/ChangeLog +15 lines
		1	2010-10-27 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[Qt] Type mismatch while serializing/deserializing message id size
		6	https://bugs.webkit.org/show_bug.cgi?id=48401
		7
		8	Use correct types when reading data from connection buffer.
		9
		10	The message id is written as uint32_t, thus the buffer size should be
		11	calculated based on sizeof(uint32_t) and not sizeof(MessageID).
		12
		13	* Platform/CoreIPC/qt/ConnectionQt.cpp:
		14	(CoreIPC::Connection::readyReadHandler):
		15
1	2010-10-26 Brent Fulgham <bfulgham@webkit.org>	16	2010-10-26 Brent Fulgham <bfulgham@webkit.org>
2		17
3	Unreviewed build fix.	18	Unreviewed build fix.