commit 65b351c9e6b2de28d9517d90c42965d0fb3c5cd6
author Marco Nelissen <marcone@google.com> Thu Apr 09 15:06:33 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 09 15:06:33 2015 +0000
tree ccf824296d111649d42cebb068d30041b830012e
parent afc7b857308aae3e33290f6af82ad8699cafde36
parent 5a5e2f411caee5017ef6f2b54c031621a8269c27

am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file"

* commit '5a5e2f411caee5017ef6f2b54c031621a8269c27':
  Fix div zero error in corrupted media file

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 8bf7f63..3dd8b11 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1172,6 +1172,11 @@
                 return ERROR_IO;
             }
 
+            if (!timescale) {
+                ALOGE("timescale should not be ZERO.");
+                return ERROR_MALFORMED;
+            }
+
             mLastTrack->timescale = ntohl(timescale);
 
             // 14496-12 says all ones means indeterminate, but some files seem to use
@@ -2636,6 +2641,11 @@
         return ERROR_MALFORMED;
     }
 
+    if (track->timescale == 0) {
+        ALOGE("timescale invalid.");
+        return ERROR_MALFORMED;
+    }
+
     return OK;
 }