From a27dee19653466844fd84d88a670daf7d0cc871a Mon Sep 17 00:00:00 2001 From: Wei Jia Date: Thu, 4 Jun 2015 10:40:23 -0700 Subject: SampleTable: fix integer overflow checks. Bug: 20139950 Change-Id: I6f4e3d4c734872074475d9346ed692a4baf77d79 Signed-off-by: Wei Jia Tested-by: Moritz Bandemer --- media/libstagefright/SampleTable.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp index 2d143a1..67097c7 100644 --- a/media/libstagefright/SampleTable.cpp +++ b/media/libstagefright/SampleTable.cpp @@ -335,7 +335,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; } @@ -384,7 +384,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; } -- cgit v1.1