am 255405eb: am 86b2ecdd: Merge "fix mem leak on error handling"

* commit '255405eb19e6a3fa7f7bb4de9b07beacdf65ece9':
  fix mem leak on error handling
This commit is contained in:
Jeff Brown 2013-05-30 14:23:58 -07:00 committed by Android Git Automerger
commit af0f8c0a56

View File

@ -1473,6 +1473,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;
}
@ -1553,7 +1555,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);