commit d9a9a324766b26be2ff0d10537ea0b215b0261e3
author Wei Jia <wjia@google.com> Tue Aug 04 18:00:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 04 18:00:56 2015 +0000
tree 0dcf9c78229fb3b0106147f6032efd4f3e0f07c5
parent 712090a60253a2879e0c7d21a33f43534ffb51fc
parent 10ef7f7514bdf6d9c38c93d9bb0194c0920d152f

am 10ef7f75: am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '10ef7f7514bdf6d9c38c93d9bb0194c0920d152f':
  SampleTable: fix integer overflow checks.

media/libstagefright/SampleTable.cpp

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