commit f7ec627f451abbd17ee0c2cb57e07700cf671f2f
author Chad Brubaker <cbrubaker@google.com> Wed Oct 07 23:39:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 07 23:39:18 2015 +0000
tree 25450d4b5b09f64b19e4f018dd5bf2094baeb282
parent 7d7a11ca73c9684b63275e82b327f6f90fcc114e
parent 1127e1b62db92a47688a6fd4df5fd0800b8295a1

am 1127e1b6: Merge "Fix benign overflow in getTimeUsOfGranule"

* commit '1127e1b62db92a47688a6fd4df5fd0800b8295a1':
  Fix benign overflow in getTimeUsOfGranule

media/libstagefright/OggExtractor.cpp

diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index 5b50212..d63ac96 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -179,6 +179,9 @@
 
 protected:
     virtual int64_t getTimeUsOfGranule(uint64_t granulePos) const {
+        if (granulePos > INT64_MAX / 1000000ll) {
+            return INT64_MAX;
+        }
         return granulePos * 1000000ll / mVi.rate;
     }
 
@@ -922,6 +925,9 @@
     if (granulePos > mCodecDelay) {
         pcmSamplePosition = granulePos - mCodecDelay;
     }
+    if (pcmSamplePosition > INT64_MAX / 1000000ll) {
+        return INT64_MAX;
+    }
     return pcmSamplePosition * 1000000ll / kOpusSampleRate;
 }