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

Commit 811391ec authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

Merge "Free mObjects if no objects left to realloc on resize" into qt-dev 

am: 4f65d337

Change-Id: I3157b38d1b2714822b7b3f37edb271628583397f
parents 271c3134 4f65d337

libs/binder/Parcel.cpp

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

                }

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

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

            }

            }



            if (objectsSize == 0) {

                free(mObjects);

                mObjects = nullptr;

            } else {

                binder_size_t* objects =

                binder_size_t* objects =

                    (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t));

                    (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t));

                if (objects) {

                if (objects) {

                    mObjects = objects;

                    mObjects = objects;

                }

                }

            }

            mObjectsSize = objectsSize;

            mObjectsSize = objectsSize;

            mNextObjectHint = 0;

            mNextObjectHint = 0;

            mObjectsSorted = false;

            mObjectsSorted = false;