diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-08-18 14:24:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-18 14:24:26 +0000 |
| commit | aa1cc74139341eb3ae9511af5310b965dbf890f4 (patch) | |
| tree | ad6d1edf7993e45e4aaa9c4412791cda0a192b07 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd (diff) | |
| parent | f11e95b21007f24e5ab77298370855f9f085b2d7 (diff) | |
| download | frameworks_av-aa1cc74139341eb3ae9511af5310b965dbf890f4.zip frameworks_av-aa1cc74139341eb3ae9511af5310b965dbf890f4.tar.gz frameworks_av-aa1cc74139341eb3ae9511af5310b965dbf890f4.tar.bz2 | |
Merge "Check buffer size before using it" into klp-dev
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -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 6e74a8f..7945ec9 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -3202,6 +3202,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 || mWantsNALFragments) { @@ -3448,6 +3452,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]; |