Merge "fix mem leak on error handling"

This commit is contained in:
Jeff Brown 2013-05-30 01:58:45 +00:00 committed by Gerrit Code Review
commit 86b2ecdd31

View File

@ -1472,6 +1472,8 @@ status_t Parcel::continueWrite(size_t desired)
if (objectsSize) {
objects = (size_t*)malloc(objectsSize*sizeof(size_t));
if (!objects) {
free(data);
mError = NO_MEMORY;
return NO_MEMORY;
}
@ -1552,7 +1554,7 @@ status_t Parcel::continueWrite(size_t desired)
mError = NO_MEMORY;
return NO_MEMORY;
}
if(!(mDataCapacity == 0 && mObjects == NULL
&& mObjectsCapacity == 0)) {
ALOGE("continueWrite: %d/%p/%d/%d", mDataCapacity, mObjects, mObjectsCapacity, desired);