Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unflattening R5/Dano messages are both using the TReadHelper class which throws

Browse Source 
exceptions in case of an error. Therefore, whenever those methods are called,
we need to surround them with a try/catch block.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17766 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-06-07 17:15:45 +00:00
parent 2d0c5e0adc
commit c13a4ddf0f
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/kits/app/Message.cpp
View File

@ -1040,13 +1040,18 @@ BMessage::Unflatten(const char *flatBuffer)
return convert_message(&message, this);
}
if (format == kMessageMagicR5 || format == kMessageMagicR5Swapped)
return BPrivate::unflatten_r5_message(format, this, flatBuffer);
try {
if (format == kMessageMagicR5 || format == kMessageMagicR5Swapped)
return BPrivate::unflatten_r5_message(format, this, flatBuffer);
if (format == kMessageMagicDano || format == kMessageMagicDanoSwapped) {
BMemoryIO stream(flatBuffer + sizeof(uint32),
BPrivate::dano_message_flattened_size(flatBuffer));
return BPrivate::unflatten_dano_message(format, stream, *this);
if (format == kMessageMagicDano || format == kMessageMagicDanoSwapped) {
BMemoryIO stream(flatBuffer + sizeof(uint32),
BPrivate::dano_message_flattened_size(flatBuffer));
return BPrivate::unflatten_dano_message(format, stream, *this);
}
} catch (status_t error) {
MakeEmpty();
return error;
}
return B_NOT_A_MESSAGE;
@ -1122,11 +1127,16 @@ BMessage::Unflatten(BDataIO *stream)
uint32 format = 0;
stream->Read(&format, sizeof(uint32));
if (format != kMessageMagicHaiku) {
if (format == kMessageMagicR5 || format == kMessageMagicR5Swapped)
return BPrivate::unflatten_r5_message(format, this, stream);
try {
if (format == kMessageMagicR5 || format == kMessageMagicR5Swapped)
return BPrivate::unflatten_r5_message(format, this, stream);
if (format == kMessageMagicDano || format == kMessageMagicDanoSwapped)
return BPrivate::unflatten_dano_message(format, *stream, *this);
if (format == kMessageMagicDano || format == kMessageMagicDanoSwapped)
return BPrivate::unflatten_dano_message(format, *stream, *this);
} catch (status_t error) {
MakeEmpty();
return error;
}
return B_NOT_A_MESSAGE;
}