From b1e14283b4bbf738ad804fddfef7e6f134510970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 5 Jul 2005 00:57:33 +0000 Subject: [PATCH] The stream was reused later, so it was a dumb idea to not include the magic in it (it was written twice then, later). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13430 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Message.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp index 879cf8e488..2829baef6a 100644 --- a/src/kits/app/Message.cpp +++ b/src/kits/app/Message.cpp @@ -2038,8 +2038,11 @@ BMessage::_SendFlattenedMessage(void *data, int32 size, port_id port, KMessage::Header *header = (KMessage::Header*)data; header->targetToken = (preferred ? B_PREFERRED_TOKEN : token); } else if (magic == kMessageMagic || magic == kMessageMagicSwapped) { - // get the header (but not the magic again) - BMemoryIO stream((uint32 *)data + 1, size - sizeof(uint32)); + // get the header + BMemoryIO stream(data, size); + + stream.Read(&magic, sizeof(uint32)); + // "discard" the magic (we already know it anyway) Header header; status_t error = header.SetMagic(magic);