summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-05 00:20:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-05 00:20:05 +0000
commit0f32f9296b84ab9a35d0bdfbf99369e87de3fe8b (patch)
treed46154971aac417f6246ed885a32ba6480f6c02f
parent56fcdad297298ada88b9d59d23554f5c4855d8cf (diff)
parent8d9391931806e1f564a571b3d0065524abb93726 (diff)
downloadnative-0f32f9296b84ab9a35d0bdfbf99369e87de3fe8b.tar.gz
Resize object capacity when shrinking Parcel am: d9d10dbdf2 am: 7bd9c861ce am: 0546a8e7eb am: 8d93919318
Change-Id: Ife836717a6bddb68eff6ce1878ac2cd834684844
-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 afa3d33349..5ad30271d7 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2839,11 +2839,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;