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