diff options
author | Marco Nelissen <marcone@google.com> | 2015-08-23 19:15:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-23 19:15:02 +0000 |
commit | d18bb120442fcc04efe269e6a26f83265eea40c8 (patch) | |
tree | 85dd5cdbfe6a9d3b880cb73cdd4a22f69961c0e6 /media | |
parent | 8cf3564d2dd522f7a707a8fd109d415dab3def47 (diff) | |
parent | 09f71c5621799e0f030b4a8058d2fb4df5977de0 (diff) | |
download | frameworks_av-d18bb120442fcc04efe269e6a26f83265eea40c8.zip frameworks_av-d18bb120442fcc04efe269e6a26f83265eea40c8.tar.gz frameworks_av-d18bb120442fcc04efe269e6a26f83265eea40c8.tar.bz2 |
am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory
* commit '09f71c5621799e0f030b4a8058d2fb4df5977de0':
Limit allocations to avoid out-of-memory
Diffstat (limited to 'media')
-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 5cd3049..e09ecc2 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -3086,16 +3086,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; } |