i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BMessage: fix passing messages by area

Browse Source 
I missed the fact that the BDataIO based Unflatten didn't handle this.
Restore the code from the recently removed buffer-based unflatten, so
it's possible to pass a message by area again.
This commit is contained in:
Adrien Destugues
2015-01-06 16:18:34 +01:00
parent 29b7900ec8
commit 1bfcb75b29
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Message.cpp
+19 -10
View File
@@ -1311,19 +1311,28 @@ BMessage::Unflatten(BDataIO* stream)
what = fHeader->what; what = fHeader->what;
fHeader->message_area = -1; if ((fHeader->flags & MESSAGE_FLAG_PASS_BY_AREA) != 0
&& fHeader->message_area >= 0) {
if (fHeader->field_count > 0) { status_t result = _Reference();
ssize_t fieldsSize = fHeader->field_count * sizeof(field_header); if (result != B_OK) {
fFields = (field_header*)malloc(fieldsSize);
if (fFields == NULL) {
_InitHeader(); _InitHeader();
return B_NO_MEMORY; return result;
} }
} else {
fHeader->message_area = -1;
result = stream->Read(fFields, fieldsSize); if (fHeader->field_count > 0) {
if (result != fieldsSize) ssize_t fieldsSize = fHeader->field_count * sizeof(field_header);
return result < 0 ? result : B_BAD_VALUE; fFields = (field_header*)malloc(fieldsSize);
if (fFields == NULL) {
_InitHeader();
return B_NO_MEMORY;
}
result = stream->Read(fFields, fieldsSize);
if (result != fieldsSize)
return result < 0 ? result : B_BAD_VALUE;
}
} }
if (fHeader->data_size > 0) { if (fHeader->data_size > 0) {