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

Commit 029c1a65 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "MP4: limit extent_count in iloc box." into qt-dev 

am: 48aa740f

Change-Id: Ib71538a34fdb5158f583e5e7e903ca625e485d5a
parents 5dabe09f 48aa740f

media/extractors/mp4/ItemTable.cpp

+2 −4
Original line number Diff line number Diff line
@@ -426,10 +426,8 @@ status_t IlocBox::parse(off64_t offset, size_t size) { 
        }

        ALOGV("extent_count %d", extent_count);



        if (extent_count > 1 && (offset_size == 0 || length_size == 0)) {

            // if the item is dividec into more than one extents, offset and

            // length must be present.

            return ERROR_MALFORMED;

        if (extent_count > 1) {

            return ERROR_UNSUPPORTED;

        }

        offset += 2;