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

Commit 3fef4f5a authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short)... 

am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread

Merge commit '95d26de9'

* commit '95d26de9':
  Properly identify malformed (too short) chunks in mpeg4 files.
parents 5eceb79a 95d26de9

media/libstagefright/MPEG4Extractor.cpp

+8 −0
Original line number Diff line number Diff line
@@ -428,6 +428,14 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) { 
        }

        chunk_size = ntoh64(chunk_size);

        data_offset += 8;



        if (chunk_size < 16) {

            // The smallest valid chunk is 16 bytes long in this case.

            return ERROR_MALFORMED;

        }

    } else if (chunk_size < 8) {

        // The smallest valid chunk is 8 bytes long.

        return ERROR_MALFORMED;

    }



    char chunk[5];