commit 3c0d59dd4397d57352416af05fde596dcc78179a
author Marco Nelissen <marcone@google.com> Mon Mar 21 16:27:40 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 21 16:27:40 2016 +0000
tree 256bb4e1de9dd7c485475936d1314b417d35554c
parent c73c64a699df828bc02f556bd0bf1724532aac36
parent 35738c6e64dbcfe62f832ace599d5fbb84dc0e98

Merge "Fix benign overflow in verifyOpusHeader"

media/libstagefright/OggExtractor.cpp

diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index d63ac96..269bdab 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -965,7 +965,7 @@
     mMeta->setInt32(kKeyChannelCount, mChannelCount);
     mMeta->setInt64(kKeyOpusSeekPreRoll /* ns */, kOpusSeekPreRollUs * 1000 /* = 80 ms*/);
     mMeta->setInt64(kKeyOpusCodecDelay /* ns */,
-            mCodecDelay /* sample/s */ * 1000000000 / kOpusSampleRate);
+            mCodecDelay /* sample/s */ * 1000000000ll / kOpusSampleRate);
 
     return OK;
 }