diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-10 01:19:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-10 01:19:11 +0000 |
| commit | 3ab51eece858f1ebc4d9c4e10bb368620d6ad713 (patch) | |
| tree | 8dfa577e142019e8407f856293a850f69a98051b /media | |
| parent | 8b882f23e045c929946d42b9b126de6e35356f0c (diff) | |
| parent | c24607c29c96f939aed9e33bfa702b1dd79da4b7 (diff) | |
| download | frameworks_av-3ab51eece858f1ebc4d9c4e10bb368620d6ad713.zip frameworks_av-3ab51eece858f1ebc4d9c4e10bb368620d6ad713.tar.gz frameworks_av-3ab51eece858f1ebc4d9c4e10bb368620d6ad713.tar.bz2 | |
Merge "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 bfae474..aba64d5 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 (std::nothrow) SampleToChunkEntry[mNumSampleToChunkOffsets]; if (!mSampleToChunkEntries) |