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

Commit 41d93c2f authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e:... 

am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit 'c88ddfc0':
  MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
parents 92b5c47a c88ddfc0

media/libstagefright/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1905,7 +1905,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                size = 0;

            }



            if (SIZE_MAX - chunk_size <= size) {

            if ((chunk_size > SIZE_MAX) || (SIZE_MAX - chunk_size <= size)) {

                return ERROR_MALFORMED;

            }