commit 7bd9c861ce55dd084c9de828a1545aaacd1b4c70
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 04 23:37:47 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 04 23:37:47 2019 +0000
tree cb046e119c50df5d31841ba5ac7a2045ab8cd0e8
parent 4c0d24b5c041250b9c15430c879f3e5a457e0b5b
parent d9d10dbdf2f20af3dd01376d2130c71c052e42f3

Resize object capacity when shrinking Parcel am: d9d10dbdf2

Change-Id: Ibae1bbd79b8219fa3a268539aa3a027c79daff58

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index baf5b04..65e38f6 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;