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

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

Merge "libstagefright: Add NULL check during memcpy for MediaCodecSource"

parents e61f9e57 e36e1034

media/libstagefright/MediaCodecSource.cpp

+5 −2
Original line number Diff line number Diff line
@@ -689,7 +689,9 @@ status_t MediaCodecSource::feedEncoderInputBuffers() { 


            sp<MediaCodecBuffer> inbuf;

            status_t err = mEncoder->getInputBuffer(bufferIndex, &inbuf);

            if (err != OK || inbuf == NULL) {



            if (err != OK || inbuf == NULL || inbuf->data() == NULL

                    || mbuf->data() == NULL || mbuf->size() == 0) {

                mbuf->release();

                signalEOS();

                break;
@@ -851,7 +853,8 @@ void MediaCodecSource::onMessageReceived(const sp<AMessage> &msg) { 


            sp<MediaCodecBuffer> outbuf;

            status_t err = mEncoder->getOutputBuffer(index, &outbuf);

            if (err != OK || outbuf == NULL) {

            if (err != OK || outbuf == NULL || outbuf->data() == NULL

                || outbuf->size() == 0) {

                signalEOS();

                break;

            }