summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-04 23:49:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-04 23:49:54 +0000
commit0546a8e7ebf87588f8a2614634c1c4eef7d3fee1 (patch)
tree7749fee01e116ed2b15bd56a8d1637e062f99c44
parentfac4161cdf50267027e7faa182bd04f30564265c (diff)
parent7bd9c861ce55dd084c9de828a1545aaacd1b4c70 (diff)
downloadnative-0546a8e7ebf87588f8a2614634c1c4eef7d3fee1.tar.gz
Resize object capacity when shrinking Parcel am: d9d10dbdf2 am: 7bd9c861ce
Change-Id: Ieedd261a16b60b53bfb00726c0dc47e380f0c379
-rw-r--r--libs/binder/Parcel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 59a363f8dd..89516bc11e 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2713,11 +2713,13 @@ status_t Parcel::continueWrite(size_t desired)
if (objectsSize == 0) {
free(mObjects);
mObjects = nullptr;
+ mObjectsCapacity = 0;
} else {
binder_size_t* objects =
(binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t));
if (objects) {
mObjects = objects;
+ mObjectsCapacity = objectsSize;
}
}
mObjectsSize = objectsSize;