Learning how to merge correctly...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14769 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
94b0f7f71c
commit
db103be7cf
|
@ -121,7 +121,7 @@ BPrivate::unflatten_dano_message(uint32 magic, BDataIO &stream,
|
|||
if (offset + sectionHeader.size > size)
|
||||
return B_BAD_DATA;
|
||||
|
||||
ssize_t fieldSize = sectionHeader.size - sizeof(SectionHeader);
|
||||
ssize_t fieldSize = sectionHeader.size - sizeof(section_header);
|
||||
uint8 *fieldBuffer = NULL;
|
||||
if (fieldSize > 0) {
|
||||
// there may be no data. we shouldn't fail because of that
|
||||
|
|
Loading…
Reference in New Issue