Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread

2010-06-24 13:14:37 -07:00
parent e57c3a88b9 736c22d3e0
commit 7b5b27ada1
1 changed files with 8 additions and 0 deletions
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@ -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];