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

Commit 835988a0 authored by Jon Larimer's avatar Jon Larimer Committed by Android Git Automerger
Browse files

am e1d095fa: Merge "MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX" 

* commit 'e1d095fa':
  MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
parents 67072a8a e1d095fa

media/libstagefright/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1953,7 +1953,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;

            }