[haiku-commits] haiku: hrev48619 - src/kits/app
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 6 Jan 2015 17:07:53 +0100 (CET)
hrev48619 adds 1 changeset to branch 'master'
old head: 607dfee24c7cd6f64c3743d74e9e37b6c990ad80
new head: caf3e27a081048bf721a271db3ca63efd0e3ae4c
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=caf3e27+%5E607dfee
----------------------------------------------------------------------------
caf3e27: BMessage: fix unflattening from a KMessage buffer
The BDataIO version of MessagePrivate::Unflatten only handles the R5 and
Dano formats, so we must call the buffer version for KMessages.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48619
Commit: caf3e27a081048bf721a271db3ca63efd0e3ae4c
URL: http://cgit.haiku-os.org/haiku/commit/?id=caf3e27
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Tue Jan 6 16:07:52 2015 UTC
----------------------------------------------------------------------------
1 file changed, 4 insertions(+)
src/kits/app/Message.cpp | 4 ++++
----------------------------------------------------------------------------
diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index 76b0b8b..15751b1 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -1274,6 +1274,10 @@ BMessage::Unflatten(const char* flatBuffer)
if (flatBuffer == NULL)
return B_BAD_VALUE;
+ uint32 format = *(uint32*)flatBuffer;
+ if (format != MESSAGE_FORMAT_HAIKU)
+ return BPrivate::MessageAdapter::Unflatten(format, this,
flatBuffer);
+
BMemoryIO io(flatBuffer, SIZE_MAX);
return Unflatten(&io);
}
Other related posts:
- » [haiku-commits] haiku: hrev48619 - src/kits/app - pulkomandy
