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

Commit 07802f43 authored by Atneya Nair's avatar Atneya Nair
Browse files

resolve merge conflicts of 9433ff3a to tm-qpr-dev-plus-aosp 

Test: Compiles
Bug: None
Change-Id: I90d9d4fc98b6434c14ddf213d0e3c1075a7eb5ee
parents 0c4d66a2 9433ff3a

media/module/extractors/mp4/MPEG4Extractor.cpp

+15 −4
Original line number Original line Diff line number Diff line
@@ -5908,12 +5908,18 @@ status_t MPEG4Source::parseTrackFragmentRun(off64_t offset, off64_t size) { 
            return -EINVAL;

            return -EINVAL;

        }

        }





        int32_t dataOffsetDelta;

        uint32_t dataOffsetDelta;

        if (!mDataSource->getUInt32(offset, (uint32_t*)&dataOffsetDelta)) {

        if (!mDataSource->getUInt32(offset, &dataOffsetDelta)) {

            return ERROR_MALFORMED;

            return ERROR_MALFORMED;

        }

        }





        dataOffset = mTrackFragmentHeaderInfo.mBaseDataOffset + dataOffsetDelta;

        if (__builtin_add_overflow(

                mTrackFragmentHeaderInfo.mBaseDataOffset, dataOffsetDelta, &dataOffset)) {

            ALOGW("b/232242894 mBaseDataOffset(%" PRIu64 ") + dataOffsetDelta(%u) overflows uint64",

                    mTrackFragmentHeaderInfo.mBaseDataOffset, dataOffsetDelta);

            android_errorWriteLog(0x534e4554, "232242894");

            return ERROR_MALFORMED;

        }





        offset += 4;

        offset += 4;

        size -= 4;

        size -= 4;
@@ -6047,7 +6053,12 @@ status_t MPEG4Source::parseTrackFragmentRun(off64_t offset, off64_t size) { 
            return NO_MEMORY;

            return NO_MEMORY;

        }

        }





        dataOffset += sampleSize;

        if (__builtin_add_overflow(dataOffset, sampleSize, &dataOffset)) {

            ALOGW("b/232242894 dataOffset(%" PRIu64 ") + sampleSize(%u) overflows uint64",

                    dataOffset, sampleSize);

            android_errorWriteLog(0x534e4554, "232242894");

            return ERROR_MALFORMED;

        }

    }

    }





    mTrackFragmentHeaderInfo.mDataOffset = dataOffset;

    mTrackFragmentHeaderInfo.mDataOffset = dataOffset;