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

Applied fix by Michael.

Browse Source 
Added him to the list of authors of this file.
Minor style cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14757 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-07 17:52:09 +00:00
parent 5f931929f7
commit 878e800c67
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/dano_message.cpp
+10 -6
View File
@@ -3,7 +3,8 @@
* Distributed under the terms of the MIT License.
*
* Authors:
* Axel Dörfler
* Axel Dörfler, [email protected]
* Michael Lotz, [email protected]
*/
@@ -170,14 +171,15 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream,
free(fieldBuffer);
throw result;
}
} break;
break;
}
case SECTION_FIXED_SIZE_ARRAY_DATA: {
FixedSizeArray *field = (FixedSizeArray *)fieldBuffer;
int32 dataOffset = sizeof(FixedSizeArray) + field->nameLength + 1;
dataOffset = pad_to_8(dataOffset);
int32 count = *(int32 *)fieldBuffer + dataOffset;
int32 count = *(int32 *)(fieldBuffer + dataOffset);
dataOffset += 8; /* count and padding */
if (offset + dataOffset + count * field->sizePerItem > size)
@@ -196,14 +198,15 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream,
dataOffset += field->sizePerItem;
}
} break;
break;
}
case SECTION_VARIABLE_SIZE_ARRAY_DATA: {
VariableSizeArray *field = (VariableSizeArray *)fieldBuffer;
int32 dataOffset = sizeof(VariableSizeArray) + field->nameLength + 1;
dataOffset = pad_to_8(dataOffset);
int32 count = *(int32 *)fieldBuffer + dataOffset;
int32 count = *(int32 *)(fieldBuffer + dataOffset);
dataOffset += sizeof(int32);
ssize_t totalSize = *(ssize_t *)fieldBuffer + dataOffset;
dataOffset += sizeof(ssize_t);
@@ -223,7 +226,8 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream,
throw result;
}
}
} break;
break;
}
}
free(fieldBuffer);