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

Commit 978ed252 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Checking BadOffset while queuing buffers" into main

parents d0514222 8b390cb1

media/jni/android_media_MediaCodec.cpp

+7 −2
Original line number Diff line number Diff line
@@ -2099,9 +2099,14 @@ static status_t extractInfosFromObject( 
        }

        if (i == 0) {

            *initialOffset = offset;

            if (CC_UNLIKELY(*initialOffset < 0)) {

                if (errorDetailMsg) {

                    *errorDetailMsg = "Error: offset/size in BufferInfo";

                }

                return BAD_VALUE;

            }

        }

        if (CC_UNLIKELY((offset >  UINT32_MAX)

                || ((long)(offset + size) > UINT32_MAX)

        if (CC_UNLIKELY(((ssize_t)(UINT32_MAX - offset) < (ssize_t)size)

                || ((offset - *initialOffset) != *totalSize))) {

            if (errorDetailMsg) {

                *errorDetailMsg = "Error: offset/size in BufferInfo";