commit 39504c325b92b888b8b39d1f96c65f5652b06524
author Treehugger Robot <treehugger-gerrit@google.com> Sat Feb 08 01:29:23 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 08 01:29:23 2020 +0000
tree 4e7894c8c6b51595687e20eeb1ac218a9f74cf1d
parent 6c7d069509677877d6ae9869e1ea1865c2eacecb
parent 5d4361bfb3286373bbeda1d0c03075c434ba917d

Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master"

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 9f71f3e..822247f 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2543,11 +2543,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;