commit 5b8a4109f5195e3ca626ab1e6ce9bfd2d1c3f2a8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 05 00:51:14 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 05 00:51:14 2019 +0000
tree 5b15b08fc964e27d3eb749bc3f723b04d18fc364
parent 9b6bcca5d487c653bc5590e3206eb599b5bd9b55
parent 90c968f6e9a9661eb3a56313ce80ded64ba95a8d

Resize object capacity when shrinking Parcel am: d9d10dbdf2 am: 7bd9c861ce am: 0546a8e7eb am: 8d93919318 am: 0f32f9296b am: 90c968f6e9

Change-Id: If221560ce978745f35de4b2f99976a25432bf421

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;