commit 24acf11dbec8e7071f9adcc24fa883c71d005215
author Joshua J. Drake <android-open-source@qoop.org> Fri Apr 10 23:44:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 10 23:44:30 2015 +0000
tree 89175479fe86d00548be0cf7f8f5c0f00bd09bc6
parent 2fdd16b3cbe1c1e53d1c4b305f4c0174b995ad1a
parent 4a13125033f2130cadb4c48b3e6e0085d8c98829

am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks

* commit '4a13125033f2130cadb4c48b3e6e0085d8c98829':
  Fix several ineffective integer overflow checks

media/libstagefright/SampleTable.cpp

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 @@
     }
 
     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 @@
     }
 
     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 @@
         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;
     }