commit e00d020b52894a001b25fddff511238f259a6f6c
author Marco Nelissen <marcone@google.com> Tue Nov 10 17:31:55 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 10 17:31:55 2015 +0000
tree 07c05136d8fd70ffeefef9a559b5e8cb832e32ba
parent bf24de292afd24c288e5522f1d0082c9fb7ec268
parent 7e150264857034bd308fdb791e0de0d618f3e231

Merge "Fix overflow check so it doesn\'t reject legitimate files" am: 7534cb3a36
am: 7e15026485

* commit '7e150264857034bd308fdb791e0de0d618f3e231':
  Fix overflow check so it doesn't reject legitimate files

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index 02b20c4..93cf055 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -246,7 +246,7 @@
     for (uint32_t i = 0; i < mNumSampleToChunkOffsets; ++i) {
         uint8_t buffer[12];
 
-        if ((off64_t)((SIZE_MAX / 12) - 8 - i) < mSampleToChunkOffset) {
+        if ((off64_t)(SIZE_MAX - 8 - (i * 12)) < mSampleToChunkOffset) {
             return ERROR_MALFORMED;
         }