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

Fixing dano_message some more. Tested successfully with all field types I could find.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14766 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2005-11-08 00:37:46 +00:00
parent 3557698909
commit 7638a8e285
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/dano_message.cpp
+14 -7
View File
@@ -119,15 +119,22 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream,
SectionHeader sectionHeader; SectionHeader sectionHeader;
reader(sectionHeader); reader(sectionHeader);
// be safe. this shouldn't be necessary but in some testcases it was.
sectionHeader.size = pad_to_8(sectionHeader.size);
if (offset + sectionHeader.size > size) if (offset + sectionHeader.size > size)
return B_BAD_DATA; return B_BAD_DATA;
ssize_t fieldSize = sectionHeader.size - sizeof(SectionHeader); ssize_t fieldSize = sectionHeader.size - sizeof(SectionHeader);
uint8 *fieldBuffer = (uint8 *)malloc(fieldSize); uint8 *fieldBuffer = NULL;
if (fieldBuffer == NULL) if (fieldSize > 0) {
throw (status_t)B_NO_MEMORY; // there may be no data. we shouldn't fail because of that
fieldBuffer = (uint8 *)malloc(fieldSize);
if (fieldBuffer == NULL)
throw (status_t)B_NO_MEMORY;
reader(fieldBuffer, fieldSize); reader(fieldBuffer, fieldSize);
}
switch (sectionHeader.code) { switch (sectionHeader.code) {
case SECTION_OFFSET_TABLE: break; /* discard */ case SECTION_OFFSET_TABLE: break; /* discard */
@@ -208,10 +215,11 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream,
dataOffset = pad_to_8(dataOffset); dataOffset = pad_to_8(dataOffset);
int32 count = *(int32 *)(fieldBuffer + dataOffset); int32 count = *(int32 *)(fieldBuffer + dataOffset);
dataOffset += sizeof(int32); dataOffset += sizeof(int32);
ssize_t totalSize = *(ssize_t *)fieldBuffer + dataOffset; ssize_t totalSize = *(ssize_t *)(fieldBuffer + dataOffset);
dataOffset += sizeof(ssize_t); dataOffset += sizeof(ssize_t);
int32 *endPoints = (int32 *)fieldBuffer + dataOffset + totalSize; int32 *endPoints = (int32 *)(fieldBuffer + dataOffset
+ totalSize);
status_t result = B_OK; status_t result = B_OK;
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
@@ -234,6 +242,5 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream,
offset += sectionHeader.size; offset += sectionHeader.size;
} }
message.PrintToStream();
return B_OK; return B_OK;
} }