diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-08-04 02:41:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 02:41:31 +0000 |
| commit | f354c48e386d1405d67882c382e26e3e4598e797 (patch) | |
| tree | f640bd669e96388c86f4df9573533895cdc85146 /media | |
| parent | 4a5fbf74b493eb293918c41a5b5f60dd7b8ebb58 (diff) | |
| parent | 5c4428f6391478ae983e1fcf7c42c832aa1a5e69 (diff) | |
| download | frameworks_av-f354c48e386d1405d67882c382e26e3e4598e797.zip frameworks_av-f354c48e386d1405d67882c382e26e3e4598e797.tar.gz frameworks_av-f354c48e386d1405d67882c382e26e3e4598e797.tar.bz2 | |
am 5c4428f6: Fix integer overflow during MP4 atom processing
* commit '5c4428f6391478ae983e1fcf7c42c832aa1a5e69':
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]; |