diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-10 23:55:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 23:55:54 +0000 |
| commit | 940189d991f9f7eb55d8a379cf6fda6ec486ceb5 (patch) | |
| tree | 4c1abe53cbd000d77db69acc1f44d64d45d429b9 /media | |
| parent | 520434cdf572d13efbca693ae9e42bfe42211b85 (diff) | |
| parent | 475de998b755f0995645e979501f59fca135009c (diff) | |
| download | frameworks_av-940189d991f9f7eb55d8a379cf6fda6ec486ceb5.zip frameworks_av-940189d991f9f7eb55d8a379cf6fda6ec486ceb5.tar.gz frameworks_av-940189d991f9f7eb55d8a379cf6fda6ec486ceb5.tar.bz2 | |
am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev
* commit '475de998b755f0995645e979501f59fca135009c':
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 b572af3..6030236 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]; |