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

Commit 13c5c34e authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Correct overflow check in Parcel resize code am: 8b64307e 

am: ed6937ae

Change-Id: I9ea154fd1f2ca3a69f756066fb49efc99e889224
parents 9d14ab54 ed6937ae

libs/binder/Parcel.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -438,7 +438,8 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len) 
    if (numObjects > 0) {

    if (numObjects > 0) {

        // grow objects

        // grow objects

        if (mObjectsCapacity < mObjectsSize + numObjects) {

        if (mObjectsCapacity < mObjectsSize + numObjects) {

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

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

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

            binder_size_t *objects =

            binder_size_t *objects =

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

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

            if (objects == (binder_size_t*)0) {

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

    }

    if (!enoughObjects) {

    if (!enoughObjects) {

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

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

        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));

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

        if (objects == NULL) return NO_MEMORY;

        if (objects == NULL) return NO_MEMORY;

        mObjects = objects;

        mObjects = objects;