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

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

Merge "NuPlayerDecoder: check buffer size before memcpy"

parents 021c4195 9b5a7ad0

media/libmediaplayer2/nuplayer2/NuPlayer2Decoder.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1088,6 +1088,12 @@ bool NuPlayer2::Decoder::onInputBufferFetched(const sp<AMessage> &msg) { 
                        static_cast<MediaBufferHolder*>(holder.get())->mediaBuffer() : nullptr;

                }

                if (mediaBuf != NULL) {

                    if (mediaBuf->size() > codecBuffer->capacity()) {

                        handleError(ERROR_BUFFER_TOO_SMALL);

                        mDequeuedInputBuffers.push_back(bufferIx);

                        return false;

                    }



                    codecBuffer->setRange(0, mediaBuf->size());

                    memcpy(codecBuffer->data(), mediaBuf->data(), mediaBuf->size());

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,12 @@ bool NuPlayer::Decoder::onInputBufferFetched(const sp<AMessage> &msg) { 
                        static_cast<MediaBufferHolder*>(holder.get())->mediaBuffer() : nullptr;

                }

                if (mediaBuf != NULL) {

                    if (mediaBuf->size() > codecBuffer->capacity()) {

                        handleError(ERROR_BUFFER_TOO_SMALL);

                        mDequeuedInputBuffers.push_back(bufferIx);

                        return false;

                    }



                    codecBuffer->setRange(0, mediaBuf->size());

                    memcpy(codecBuffer->data(), mediaBuf->data(), mediaBuf->size());