commit ae9494bb8f3a27ba9c4efd63084e1da22fa8baa6
author Wei Jia <wjia@google.com> Mon Aug 17 21:39:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 17 21:39:35 2015 +0000
tree d590099f1e3312845a0e79247e022e9d5128f843
parent 152cbce078cb08b7a1540cafdbb3c18e317cc785
parent 47bfaf57c2fe88b29a1d6e05dfc1fc35e7d08697

am 47bfaf57: am 3264b251: am 39ff8149: Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev

* commit '47bfaf57c2fe88b29a1d6e05dfc1fc35e7d08697':
  libstagefright: fix possible overflow in SampleTable.cpp

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index 40df34d..aeef99f 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -336,7 +336,7 @@
 
     mTimeToSampleCount = U32_AT(&header[4]);
     uint64_t allocSize = (uint64_t)mTimeToSampleCount * 2 * sizeof(uint32_t);
-    if (allocSize > SIZE_MAX) {
+    if (allocSize > UINT32_MAX) {
         return ERROR_OUT_OF_RANGE;
     }
     mTimeToSample = new (std::nothrow) uint32_t[mTimeToSampleCount * 2];
@@ -384,7 +384,7 @@
 
     mNumCompositionTimeDeltaEntries = numEntries;
     uint64_t allocSize = (uint64_t)numEntries * 2 * sizeof(uint32_t);
-    if (allocSize > SIZE_MAX) {
+    if (allocSize > UINT32_MAX) {
         return ERROR_OUT_OF_RANGE;
     }