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

Commit 795726df authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

Avoid read out of bounds am: 9d33304e am: e2a8a1e3 am: 726b9eb5 am:... 

Avoid read out of bounds am: 9d33304e am: e2a8a1e3 am: 726b9eb5 am: 0fc277db am: b2c01cbb am: ba1dcc15

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18492389



Change-Id: Iae0e7e32891101f7091364ac460450b38c96a0e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a74e1bbe ba1dcc15

media/extractors/mp4/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4771,7 +4771,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio( 
        if (len2 == 0) {

            return ERROR_MALFORMED;

        }

        if (offset >= csd_size || csd[offset] != 0x01) {

        if (offset + len1 > csd_size || csd[offset] != 0x01) {

            return ERROR_MALFORMED;

        }