commit dc3aaa41d29ddf60d0ffd5a24303c725747441d1
author android-build-team Robot <android-build-team-robot@google.com> Fri Dec 06 02:11:14 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Dec 06 02:11:14 2019 +0000
tree 5b15b08fc964e27d3eb749bc3f723b04d18fc364
parent 71b4f4ff89f54e64d34fbd0ea934a0997316cf8c
parent 5b8a4109f5195e3ca626ab1e6ce9bfd2d1c3f2a8

Snap for 6052638 from 5b8a4109f5195e3ca626ab1e6ce9bfd2d1c3f2a8 to qt-qpr2-release

Change-Id: I2db19cc26f7d0f094346a2732cb70e1756d7194c

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;