| commit | e1d095fa8bbb0d944722ce93d54962d1efb84a6f | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 13 17:33:18 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Aug 13 17:33:18 2015 +0000 |
| tree | caeba48b93282bf362c9bdee1315abff5a8c52af | |
| parent | 913efd2bb99a056eb44395a93c6aa361a96dde6a [diff] | |
| parent | c4717852eeb9eaa567990af14b7b4116e2d682f7 [diff] |
Merge "MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX"
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 5fab865..1f635f4 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1953,7 +1953,7 @@ size = 0; } - if (SIZE_MAX - chunk_size <= size) { + if ((chunk_size > SIZE_MAX) || (SIZE_MAX - chunk_size <= size)) { return ERROR_MALFORMED; }