diff options
author | Marco Nelissen <marcone@google.com> | 2015-08-24 23:17:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 23:17:49 +0000 |
commit | a6bafbc5da25db600d7311c0ba47a3fe034b4471 (patch) | |
tree | d9823a0a5f064b02a9cebc4ec50776a4daf12bb1 | |
parent | fa11fd5bb2e9c5e00f7fecbbe76c279193182cee (diff) | |
parent | 2c02f5eeec639825ece4acbca0d1969da192dca0 (diff) | |
download | frameworks_av-a6bafbc5da25db600d7311c0ba47a3fe034b4471.zip frameworks_av-a6bafbc5da25db600d7311c0ba47a3fe034b4471.tar.gz frameworks_av-a6bafbc5da25db600d7311c0ba47a3fe034b4471.tar.bz2 |
am 2c02f5ee: am 719cd33e: am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory
* commit '2c02f5eeec639825ece4acbca0d1969da192dca0':
Limit allocations to avoid out-of-memory
-rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index e2b1675..08e989b 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -3099,16 +3099,24 @@ status_t MPEG4Source::start(MetaData *params) { mWantsNALFragments = false; } + int32_t tmp; + CHECK(mFormat->findInt32(kKeyMaxInputSize, &tmp)); + size_t max_size = tmp; + + // A somewhat arbitrary limit that should be sufficient for 8k video frames + // If you see the message below for a valid input stream: increase the limit + if (max_size > 64 * 1024 * 1024) { + ALOGE("bogus max input size: %zu", max_size); + return ERROR_MALFORMED; + } mGroup = new MediaBufferGroup; - - int32_t max_size; - CHECK(mFormat->findInt32(kKeyMaxInputSize, &max_size)); - mGroup->add_buffer(new MediaBuffer(max_size)); mSrcBuffer = new (std::nothrow) uint8_t[max_size]; if (mSrcBuffer == NULL) { // file probably specified a bad max size + delete mGroup; + mGroup = NULL; return ERROR_MALFORMED; } |