commit c1aa15f04d3aa38d41f73a280df627e317ce0cb3
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 27 17:12:52 2019 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 27 17:12:52 2019 +0000
tree 649d5eeb6439e8d53b60792f084117781dee8f7a
parent b6ac1f11ddc3ced1863ae61f7970b3b9484b0ac3
parent 5ab710e47686c6cda7e65e67011353f6752311ca

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

Change-Id: I2c585ccff7d630ac4f329f2c4ccc4d6c8540f43c

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index ca8277d..baf5b04 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;