commit 0f32f9296b84ab9a35d0bdfbf99369e87de3fe8b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 05 00:20:05 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 05 00:20:05 2019 +0000
tree d46154971aac417f6246ed885a32ba6480f6c02f
parent 56fcdad297298ada88b9d59d23554f5c4855d8cf
parent 8d9391931806e1f564a571b3d0065524abb93726

Resize object capacity when shrinking Parcel am: d9d10dbdf2 am: 7bd9c861ce am: 0546a8e7eb am: 8d93919318

Change-Id: Ife836717a6bddb68eff6ce1878ac2cd834684844

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index afa3d33..5ad3027 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2839,11 +2839,13 @@
             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;