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

Commit 1a58a266 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

Merge "Fix null pointer dereferencing in TWGBP" into oc-mr1-dev 

am: e4bf97fb

Change-Id: Idf6dab48665317af55caed54e11d6fa0b28a32d6
parents 04790854 e4bf97fb

media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,9 @@ Return<void> TWGraphicBufferProducer::requestBuffer( 
    sp<GraphicBuffer> buf;

    sp<GraphicBuffer> buf;

    status_t status = mBase->requestBuffer(slot, &buf);

    status_t status = mBase->requestBuffer(slot, &buf);

    AnwBuffer anwBuffer;

    AnwBuffer anwBuffer;

    if (buf != nullptr) {

        wrapAs(&anwBuffer, *buf);

        wrapAs(&anwBuffer, *buf);

    }

    _hidl_cb(static_cast<int32_t>(status), anwBuffer);

    _hidl_cb(static_cast<int32_t>(status), anwBuffer);

    return Void();

    return Void();

}

}

media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -2064,8 +2064,10 @@ inline bool convertTo( 
    int const* constFds = static_cast<int const*>(baseFds.get());

    int const* constFds = static_cast<int const*>(baseFds.get());

    numFds = baseNumFds;

    numFds = baseNumFds;

    if (l->unflatten(constBuffer, size, constFds, numFds) != NO_ERROR) {

    if (l->unflatten(constBuffer, size, constFds, numFds) != NO_ERROR) {

        if (nh != nullptr) {

            native_handle_close(nh);

            native_handle_close(nh);

            native_handle_delete(nh);

            native_handle_delete(nh);

        }

        return false;

        return false;

    }

    }