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

Commit e4bf97fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 1a6ee56d d8cbbf9f

media/libstagefright/omx/1.0/WGraphicBufferProducer.cpp

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

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

    AnwBuffer anwBuffer;

    if (buf != nullptr) {

        wrapAs(&anwBuffer, *buf);

    }

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

    return Void();

}

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

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

    numFds = baseNumFds;

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

        if (nh != nullptr) {

            native_handle_close(nh);

            native_handle_delete(nh);

        }

        return false;

    }