diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-08-18 16:33:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 16:33:55 +0000 |
| commit | a1e462e5531db20d1dc70c3e24c82879a0a90870 (patch) | |
| tree | 490fd984b4ee20b95259e6bdc9f514941a703b81 /media | |
| parent | 5ff4bb7a65f0495c2cd79413ef3001b208ae7e2c (diff) | |
| parent | 0afecdebaea1982ead120a701ddd24f2b0ff3897 (diff) | |
| download | frameworks_av-a1e462e5531db20d1dc70c3e24c82879a0a90870.zip frameworks_av-a1e462e5531db20d1dc70c3e24c82879a0a90870.tar.gz frameworks_av-a1e462e5531db20d1dc70c3e24c82879a0a90870.tar.bz2 | |
am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '0afecdebaea1982ead120a701ddd24f2b0ff3897':
Check buffer size before using it
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 54c8eab..193e51b 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -3811,6 +3811,10 @@ status_t MPEG4Source::read( CHECK(mBuffer == NULL); return err; } + if (size > mBuffer->size()) { + ALOGE("buffer too small: %zu > %zu", size, mBuffer->size()); + return ERROR_BUFFER_TOO_SMALL; + } } if ((!mIsAVC && !mIsHEVC) || mWantsNALFragments) { @@ -4071,6 +4075,10 @@ status_t MPEG4Source::fragmentedRead( ALOGV("acquire_buffer returned %d", err); return err; } + if (size > mBuffer->size()) { + ALOGE("buffer too small: %zu > %zu", size, mBuffer->size()); + return ERROR_BUFFER_TOO_SMALL; + } } const Sample *smpl = &mCurrentSamples[mCurrentSampleIndex]; |