diff options
| author | Wei Jia <wjia@google.com> | 2015-08-04 18:28:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 18:28:58 +0000 |
| commit | d8bb17e33ef33ce173fa2d096211785145d41921 (patch) | |
| tree | 5a3c7fa3e71016fd6d9f034ab9f1101f1d78eb4e /media | |
| parent | 0b1ac0f74a2057e1fa659f73391bd09dadbd4daa (diff) | |
| parent | 42bd61d73e8b4d0b1101e73324a59fde51077112 (diff) | |
| download | frameworks_av-d8bb17e33ef33ce173fa2d096211785145d41921.zip frameworks_av-d8bb17e33ef33ce173fa2d096211785145d41921.tar.gz frameworks_av-d8bb17e33ef33ce173fa2d096211785145d41921.tar.bz2 | |
am 42bd61d7: am d9a9a324: am 10ef7f75: am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.
* commit '42bd61d73e8b4d0b1101e73324a59fde51077112':
SampleTable: fix integer overflow checks.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/SampleTable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 6030236..0c7cba4 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -333,7 +333,7 @@ status_t SampleTable::setTimeToSampleParams( } mTimeToSampleCount = U32_AT(&header[4]); - uint64_t allocSize = mTimeToSampleCount * 2 * (uint64_t)sizeof(uint32_t); + uint64_t allocSize = (uint64_t)mTimeToSampleCount * 2 * sizeof(uint32_t); if (allocSize > SIZE_MAX) { return ERROR_OUT_OF_RANGE; } @@ -379,7 +379,7 @@ status_t SampleTable::setCompositionTimeToSampleParams( } mNumCompositionTimeDeltaEntries = numEntries; - uint64_t allocSize = numEntries * 2 * (uint64_t)sizeof(uint32_t); + uint64_t allocSize = (uint64_t)numEntries * 2 * sizeof(uint32_t); if (allocSize > SIZE_MAX) { return ERROR_OUT_OF_RANGE; } |