summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua J. Drake <android-open-source@qoop.org>2015-04-11 00:25:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-11 00:25:13 +0000
commit86fb91857ecaca2a0dc27abcd369c5f35203e922 (patch)
tree2ba382f23813c0a8acc9a206e4f6dd09527731a1
parentd513b7da73be6013daa321e1f8c2e488dec65dcd (diff)
parent75a8776ebdce0694e00fd3df06c36c3890e21cde (diff)
downloadframeworks_av-86fb91857ecaca2a0dc27abcd369c5f35203e922.zip
frameworks_av-86fb91857ecaca2a0dc27abcd369c5f35203e922.tar.gz
frameworks_av-86fb91857ecaca2a0dc27abcd369c5f35203e922.tar.bz2
am 75a8776e: am 3cff4324: am 520434cd: am 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks
* commit '75a8776ebdce0694e00fd3df06c36c3890e21cde': Fix several ineffective integer overflow checks
-rw-r--r--media/libstagefright/SampleTable.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index bdd6d56..b572af3 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -330,7 +330,7 @@ status_t SampleTable::setTimeToSampleParams(
}
mTimeToSampleCount = U32_AT(&header[4]);
- uint64_t allocSize = mTimeToSampleCount * 2 * sizeof(uint32_t);
+ uint64_t allocSize = mTimeToSampleCount * 2 * (uint64_t)sizeof(uint32_t);
if (allocSize > SIZE_MAX) {
return ERROR_OUT_OF_RANGE;
}
@@ -376,7 +376,7 @@ status_t SampleTable::setCompositionTimeToSampleParams(
}
mNumCompositionTimeDeltaEntries = numEntries;
- uint64_t allocSize = numEntries * 2 * sizeof(uint32_t);
+ uint64_t allocSize = numEntries * 2 * (uint64_t)sizeof(uint32_t);
if (allocSize > SIZE_MAX) {
return ERROR_OUT_OF_RANGE;
}
@@ -426,7 +426,7 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size)
ALOGV("Table of sync samples is empty or has only a single entry!");
}
- uint64_t allocSize = mNumSyncSamples * sizeof(uint32_t);
+ uint64_t allocSize = mNumSyncSamples * (uint64_t)sizeof(uint32_t);
if (allocSize > SIZE_MAX) {
return ERROR_OUT_OF_RANGE;
}