diff options
| author | Wei Jia <wjia@google.com> | 2015-08-04 17:20:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 17:20:14 +0000 |
| commit | 7af634e131361862d2e47fb344278e31ed05be4f (patch) | |
| tree | 2199d7f6a2c2642b10f94b6576e87ad43ccc353c /media | |
| parent | b417986c3a3a6bb9ca33657385a3433ff54090b2 (diff) | |
| parent | 8ec119d2f033221e4cb0fd2b2948e780581b3d35 (diff) | |
| download | frameworks_av-7af634e131361862d2e47fb344278e31ed05be4f.zip frameworks_av-7af634e131361862d2e47fb344278e31ed05be4f.tar.gz frameworks_av-7af634e131361862d2e47fb344278e31ed05be4f.tar.bz2 | |
am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.
* commit '8ec119d2f033221e4cb0fd2b2948e780581b3d35':
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 a7ceecb..52ce82b 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; } |