commit 5fef11c61a76a5a1ddbb362cbe159d7950e265f4
author Marco Nelissen <marcone@google.com> Mon Mar 13 23:06:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 13 23:06:24 2017 +0000
tree ac98dbbebd7285c20c87a493d7b147f2510e1e54
parent 0cbbb5c56170aab43ba6db0fa4ddba80a35bbd7c
parent 946a690f5ceeb3837891a7bab6938bd6a2fdbbc6

Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd
am: 946a690f5c

Change-Id: I265078e7cab77a8865862f3b0319bfb0746ee814

media/libstagefright/AMRExtractor.cpp

diff --git a/media/libstagefright/AMRExtractor.cpp b/media/libstagefright/AMRExtractor.cpp
index a6fb3d8..9c07403 100644
--- a/media/libstagefright/AMRExtractor.cpp
+++ b/media/libstagefright/AMRExtractor.cpp
@@ -253,7 +253,7 @@
 
     int64_t seekTimeUs;
     ReadOptions::SeekMode mode;
-    if (options && options->getSeekTo(&seekTimeUs, &mode)) {
+    if (mOffsetTableLength > 0 && options && options->getSeekTo(&seekTimeUs, &mode)) {
         size_t size;
         int64_t seekFrame = seekTimeUs / 20000ll;  // 20ms per frame.
         mCurrentTimeUs = seekFrame * 20000ll;

media/libstagefright/NuMediaExtractor.cpp

diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index f24cf3a..6de2bb3 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -542,7 +542,7 @@
     }
 
     off64_t size;
-    if (mDurationUs >= 0 && mDataSource->getSize(&size) == OK) {
+    if (mDurationUs > 0 && mDataSource->getSize(&size) == OK) {
         *bitrate = size * 8000000ll / mDurationUs;  // in bits/sec
         return true;
     }