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

Commit 79b74d78 authored by Christopher Tate's avatar Christopher Tate
Browse files

resolve merge conflicts of 13c5c34e to mnc-dev 

Change-Id: I7f57cde153648f48ff038400aa437b76971d4771
parents 275b2347 13c5c34e

libs/binder/Parcel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len) 
        // grow objects

        if (mObjectsCapacity < mObjectsSize + numObjects) {

            size_t newSize = ((mObjectsSize + numObjects)*3)/2;

            if (newSize < mObjectsSize) return NO_MEMORY;   // overflow

            if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY;   // overflow

            binder_size_t *objects =

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

            if (objects == (binder_size_t*)0) {
@@ -1039,7 +1039,7 @@ restart_write: 
    }

    if (!enoughObjects) {

        size_t newSize = ((mObjectsSize+2)*3)/2;

        if (newSize < mObjectsSize) return NO_MEMORY;   // overflow

        if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY;   // overflow

        binder_size_t* objects = (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));

        if (objects == NULL) return NO_MEMORY;

        mObjects = objects;