commit 894aa94e101f9ff9a074f2bcc4d1fb989cf9ea04
author Chad Brubaker <cbrubaker@google.com> Wed Oct 07 15:42:11 2015 -0700
committer Chad Brubaker <cbrubaker@google.com> Wed Oct 07 15:42:11 2015 -0700
tree 8f97756a2d35af443889d48f8e5cbdc2913ab9b7
parent de83504563a01201511657d1824fe2e23f1d7916

Fix benign overflow in getTimeUsOfGranule

Bug: 24748446
Change-Id: I1f8e3927e9a8f646a0d804161924ae0dcc5ab75d

media/libstagefright/OggExtractor.cpp

diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index 692445a..4f5190c 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -178,6 +178,9 @@
 
 protected:
     virtual int64_t getTimeUsOfGranule(uint64_t granulePos) const {
+        if (granulePos > INT64_MAX / 1000000ll) {
+            return INT64_MAX;
+        }
         return granulePos * 1000000ll / mVi.rate;
     }
 
@@ -921,6 +924,9 @@
     if (granulePos > mCodecDelay) {
         pcmSamplePosition = granulePos - mCodecDelay;
     }
+    if (pcmSamplePosition > INT64_MAX / 1000000ll) {
+        return INT64_MAX;
+    }
     return pcmSamplePosition * 1000000ll / kOpusSampleRate;
 }