BMessage: Clean up properly when reading the stream fails.
Otherwise we leave things in an inconsistent state and could wind up crashing later. Fixes #18088.
This commit is contained in:
@@ -1367,10 +1367,16 @@ BMessage::Unflatten(BDataIO* stream)
|
|||||||
}
|
}
|
||||||
|
|
||||||
result = stream->Read(fData, fHeader->data_size);
|
result = stream->Read(fData, fHeader->data_size);
|
||||||
if (result != (ssize_t)fHeader->data_size)
|
if (result != (ssize_t)fHeader->data_size) {
|
||||||
|
free(fData);
|
||||||
|
fData = NULL;
|
||||||
|
free(fFields);
|
||||||
|
fFields = NULL;
|
||||||
|
_InitHeader();
|
||||||
return result < 0 ? result : B_BAD_VALUE;
|
return result < 0 ? result : B_BAD_VALUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return _ValidateMessage();
|
return _ValidateMessage();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user