diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-10 23:34:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 23:34:57 +0000 |
| commit | 4775930799bd9a9fbad8efe5d338e890dd7444ed (patch) | |
| tree | a4c26313d41833b61ca8c25d2ae66fabb373b6da /media | |
| parent | 4a13125033f2130cadb4c48b3e6e0085d8c98829 (diff) | |
| parent | 17b625b7f51b75fde6640c737474b8b2c51412bf (diff) | |
| download | frameworks_av-4775930799bd9a9fbad8efe5d338e890dd7444ed.zip frameworks_av-4775930799bd9a9fbad8efe5d338e890dd7444ed.tar.gz frameworks_av-4775930799bd9a9fbad8efe5d338e890dd7444ed.tar.bz2 | |
am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev
* commit '17b625b7f51b75fde6640c737474b8b2c51412bf':
Fix integer overflow during MP4 atom processing
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/SampleTable.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 1358582..a7ceecb 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -230,6 +230,9 @@ status_t SampleTable::setSampleToChunkParams( return ERROR_MALFORMED; } + if (SIZE_MAX / sizeof(SampleToChunkEntry) <= mNumSampleToChunkOffsets) + return ERROR_OUT_OF_RANGE; + mSampleToChunkEntries = new SampleToChunkEntry[mNumSampleToChunkOffsets]; |