Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b788aa5 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

[automerger] Free mObjects if no objects left to realloc on resize am:... 

[automerger] Free mObjects if no objects left to realloc on resize am: edd3e3d8 am: c0394a66 am: fbdb526a am: 40d0133f am: 5ab710e4 am: c1aa15f0 am: bfb94fae
am: f658b2d8

Change-Id: Ib5613a17fa841e618c04030c4aebbe20fbb30107
parents aa8a9cce f658b2d8

libs/binder/Parcel.cpp

+10 −4
Original line number Diff line number Diff line
@@ -2709,11 +2709,17 @@ status_t Parcel::continueWrite(size_t desired) 
                }

                release_object(proc, *flat, this, &mOpenAshmemSize);

            }



            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;

            mObjectsSorted = false;