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

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

am 9d9491f9: am 0dbd0d7b: am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9:... 

am 9d9491f9: am 0dbd0d7b: am c9924410: am 2fe61ed0: am 3b8d3fa0: am 186d1fb9: am f4dfe12e: am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit '9d9491f9':
  MPEG4Extractor.cpp: Add check for size == SIZE_MAX
parents f59348ed 9d9491f9

media/libstagefright/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2029,7 +2029,7 @@ status_t MPEG4Extractor::parseTrackHeader( 
}



status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) {

    if (size < 4) {

    if (size < 4 || size == SIZE_MAX) {

        return ERROR_MALFORMED;

    }