diff options
| author | Joshua J. Drake <android-open-source@qoop.org> | 2015-08-04 04:45:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 04:45:42 +0000 |
| commit | a9f1e993fa7849bc658d89a2faa58344faa88a5f (patch) | |
| tree | cf6b1995e7849dd9f6c6da5b1f47983bdbbcf9a7 /media | |
| parent | b77a6189a468a90fe74fafca862a31c3bf899ceb (diff) | |
| parent | 134dc3110c401544e4d3a3a1deab1c131fb77720 (diff) | |
| download | frameworks_av-a9f1e993fa7849bc658d89a2faa58344faa88a5f.zip frameworks_av-a9f1e993fa7849bc658d89a2faa58344faa88a5f.tar.gz frameworks_av-a9f1e993fa7849bc658d89a2faa58344faa88a5f.tar.bz2 | |
am 134dc311: am 80a6d9f3: am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing
* commit '134dc3110c401544e4d3a3a1deab1c131fb77720':
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]; |