commit 8d9391931806e1f564a571b3d0065524abb93726
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 05 00:08:11 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 05 00:08:11 2019 +0000
tree d99ae44f478aaad567ce053652136720cb5f68c3
parent ddb9c9924cc25f2ebf10246fd0d1cc50e8ac51a4
parent 0546a8e7ebf87588f8a2614634c1c4eef7d3fee1

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

Change-Id: Ideab6bb995a16de93e6bfcb41435ce135248031c

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 3c6603e..43e4580 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2713,11 +2713,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;