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

Commit c66e7dfa authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "Fix out of bounds read and write in onQueueFilled in outQueue" into main

parents 347a5ffe 8f4cfda9
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -314,9 +314,12 @@ void SoftMPEG4::onQueueFilled(OMX_U32 /* portIndex */) {
        outHeader->nFilledLen = frameSize;

        List<BufferInfo *>::iterator it = outQueue.begin();
        while ((*it)->mHeader != outHeader) {
        while (it != outQueue.end() && (*it)->mHeader != outHeader) {
             ++it;
        }
        if (it == outQueue.end()) {
            return;
        }

        BufferInfo *outInfo = *it;
        outInfo->mOwnedByUs = false;