diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-10 23:15:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-10 23:15:53 +0000 |
| commit | 17b625b7f51b75fde6640c737474b8b2c51412bf (patch) | |
| tree | c49fddb7ad3c23378a58212b9239d34f2f7ae99c | |
| parent | 030d8d0a557097b88d6ecbf6d04823213512b620 (diff) | |
| parent | 5c134e6b2047b10877f02a46f4bb293537269f00 (diff) | |
| download | frameworks_av-17b625b7f51b75fde6640c737474b8b2c51412bf.zip frameworks_av-17b625b7f51b75fde6640c737474b8b2c51412bf.tar.gz frameworks_av-17b625b7f51b75fde6640c737474b8b2c51412bf.tar.bz2 | |
Merge "Fix integer overflow during MP4 atom processing" into klp-dev
| -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]; |