commit 524f4386465fe9911cc067c0c2a4fa3eadad211d
author James Dong <jdong@google.com> Mon Jul 02 13:25:37 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 02 13:25:37 2012 -0700
tree 8e07104091545e3a8a2294800382e2be8993e7a9
parent a01992a0675a06df7d0bbe7b977207dd0c33fdc7
parent 53f69c194d7ae8105b4c6d0c9901eb96281c7bf9

Merge "Fixed a video editor crash due to "divided by 0""

libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp

diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
index 5026073..f735c0b 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
@@ -1483,11 +1483,15 @@
                     (int32_t*)&(pVideoStreamHandler->m_videoHeight));
 
                 (*pStreamHandler)  = (M4_StreamHandler*)(pVideoStreamHandler);
-                meta->findInt64(kKeyDuration,
-                    (int64_t*)&(Duration));
-                ((*pStreamHandler)->m_duration) =
-                    (int32_t)((Duration)/1000); // conversion to mS
+                meta->findInt64(kKeyDuration, (int64_t*)&(Duration));
+                ((*pStreamHandler)->m_duration) = (int32_t)((Duration)/1000); // conversion to mS
                 pC->mMaxDuration = ((*pStreamHandler)->m_duration);
+                if (pC->mMaxDuration == 0) {
+                    ALOGE("Video is too short: %lld Us", Duration);
+                    delete pVideoStreamHandler;
+                    pVideoStreamHandler = NULL;
+                    return M4ERR_PARAMETER;
+                }
                 ALOGV("VideoEditor3gpReader_getNextStreamHandler m_duration %d",
                     (*pStreamHandler)->m_duration);