commit f8c45a90a69cec5041f6fb11a7e31af646e43d25
author Mike Lockwood <lockwood@android.com> Sat Apr 23 08:55:59 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 23 08:55:59 2011 -0700
tree 25178b47e21a8c6e83cb760950457585a4797e89
parent 34fe252c89e33572d01fea981b58d7b115e76164
parent 7d77dcfadd7fb637ed2c3aef5bb3990dd0a67dc0

Merge "MTP: Add extended operations to support in-place editing of files"

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index f9db1a1..01d0a92 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2028,14 +2028,18 @@
             size_t dstOffset = 0;
 
             while (srcOffset < size) {
-                CHECK(srcOffset + mNALLengthSize <= size);
-                size_t nalLength = parseNALSize(&mSrcBuffer[srcOffset]);
-                srcOffset += mNALLengthSize;
+                bool isMalFormed = (srcOffset + mNALLengthSize > size);
+                size_t nalLength = 0;
+                if (!isMalFormed) {
+                    nalLength = parseNALSize(&mSrcBuffer[srcOffset]);
+                    srcOffset += mNALLengthSize;
+                    isMalFormed = srcOffset + nalLength > size;
+                }
 
-                if (srcOffset + nalLength > size) {
+                if (isMalFormed) {
+                    LOGE("Video is malformed");
                     mBuffer->release();
                     mBuffer = NULL;
-
                     return ERROR_MALFORMED;
                 }