commit 5b788aa514935cc3785e93669bbd96cb347d5f08
author Michael Wachenschwanz <mwachens@google.com> Mon Jul 01 10:24:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 10:24:37 2019 -0700
tree 6b3a764aa666193cfc2656059b3b349b956fb22a
parent aa8a9ccedaa186d9b4d9e6c7bd8e8b0585b198a3
parent f658b2d8b3d83e82dcb32f5cffdbc9ccbb46f8fc

[automerger] Free mObjects if no objects left to realloc on resize am: edd3e3d8f4 am: c0394a6662 am: fbdb526a6a am: 40d0133f6d am: 5ab710e476 am: c1aa15f04d am: bfb94faeac
am: f658b2d8b3

Change-Id: Ib5613a17fa841e618c04030c4aebbe20fbb30107

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 8e206f5..3c6603e 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2709,10 +2709,16 @@
                 }
                 release_object(proc, *flat, this, &mOpenAshmemSize);
             }
-            binder_size_t* objects =
-                (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t));
-            if (objects) {
-                mObjects = objects;
+
+            if (objectsSize == 0) {
+                free(mObjects);
+                mObjects = nullptr;
+            } else {
+                binder_size_t* objects =
+                    (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t));
+                if (objects) {
+                    mObjects = objects;
+                }
             }
             mObjectsSize = objectsSize;
             mNextObjectHint = 0;