diff options
| author | Wei Jia <wjia@google.com> | 2015-06-11 13:33:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-11 13:33:37 +0000 |
| commit | f475f6c0cf28f3b4c1ae677febb7590c70865f81 (patch) | |
| tree | 8d7414bff1dbbd74049e4afa6b2e64454ed3d749 | |
| parent | 068805802f78ff82e4ba40adffc33ddcd3b0eb8f (diff) | |
| parent | e168bdd22042830eb436aac571fb2ea23c84b035 (diff) | |
| download | frameworks_av-f475f6c0cf28f3b4c1ae677febb7590c70865f81.zip frameworks_av-f475f6c0cf28f3b4c1ae677febb7590c70865f81.tar.gz frameworks_av-f475f6c0cf28f3b4c1ae677febb7590c70865f81.tar.bz2 | |
am e168bdd2: am f19acf48: am 66b91b34: am e6382cb0: am 115e995c: resolved conflicts for merge of 1f44d837 to lmp-dev
* commit 'e168bdd22042830eb436aac571fb2ea23c84b035':
Fix integer overflow when handling MPEG4 tx3g atom
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 613f0bc..ffeb579 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1893,6 +1893,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { size = 0; } + if (SIZE_MAX - chunk_size <= size) { + return ERROR_MALFORMED; + } + uint8_t *buffer = new (std::nothrow) uint8_t[size + chunk_size]; if (buffer == NULL) { return ERROR_MALFORMED; |