commit d9d10dbdf2f20af3dd01376d2130c71c052e42f3
author Michael Wachenschwanz <mwachens@google.com> Tue Oct 15 11:49:22 2019 -0700
committer Michael Wachenschwanz <mwachens@google.com> Mon Nov 11 21:24:00 2019 +0000
tree c1d22af2724cdaacbb3b6cc77baf6e74c660e98c
parent dbd0eecfc7570231d5cbb76678b0358c43ee6d3c

Resize object capacity when shrinking Parcel

Bug: 140419401
Test: atest android.os.cts.ParcelTest
Change-Id: I04edee415e1984ba5fb97c5c1b09892a360cf221
(cherry picked from commit c67d9f33b36cbb95b121d058f51d6653f1ec4334)

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;