diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-08-04 03:15:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 03:15:45 +0000 |
| commit | e10c2e621a0a49618c9d69a7dd09400c23464ced (patch) | |
| tree | 0202958aa69aa4398a23d8d4e4c3c0666e149d81 /media | |
| parent | 36617c67a9c29d7f9798972b6514086b22b731f8 (diff) | |
| parent | 74ebcd65d1833879944a496739da6983b1d18235 (diff) | |
| download | frameworks_av-e10c2e621a0a49618c9d69a7dd09400c23464ced.zip frameworks_av-e10c2e621a0a49618c9d69a7dd09400c23464ced.tar.gz frameworks_av-e10c2e621a0a49618c9d69a7dd09400c23464ced.tar.bz2 | |
am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing
* commit '74ebcd65d1833879944a496739da6983b1d18235':
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]; |