diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-27 17:12:52 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-27 17:12:52 +0000 |
commit | c1aa15f04d3aa38d41f73a280df627e317ce0cb3 (patch) | |
tree | 649d5eeb6439e8d53b60792f084117781dee8f7a | |
parent | b6ac1f11ddc3ced1863ae61f7970b3b9484b0ac3 (diff) | |
parent | 5ab710e47686c6cda7e65e67011353f6752311ca (diff) | |
download | native-c1aa15f04d3aa38d41f73a280df627e317ce0cb3.tar.gz |
[automerger] Free mObjects if no objects left to realloc on resize am: edd3e3d8f4 am: c0394a6662 am: fbdb526a6a am: 40d0133f6d am: 5ab710e476
Change-Id: I2c585ccff7d630ac4f329f2c4ccc4d6c8540f43c
-rw-r--r-- | libs/binder/Parcel.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index ca8277d26c..baf5b04760 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -2709,10 +2709,16 @@ status_t Parcel::continueWrite(size_t desired) } 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; |