commit f79f26d2575b2fe659375cf8e0f443c8bd5e4822
author Robert Shih <robertshih@google.com> Mon Jan 30 19:46:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 30 19:46:10 2017 +0000
tree 62af1c3abf915065d45dc6e741b68f28ce2f761b
parent 7da83aadf4e765c38bc6cad04ce086dad20ef54a
parent 91fe76a157847825601b8f7a627efd1c9cbadcae

avc_utils: skip empty NALs from malformed bistreams
am: 91fe76a157

Change-Id: I4fc3e40dbfe2839611265ba178a9f35e05bcc28a

media/libstagefright/avc_utils.cpp

diff --git a/media/libstagefright/avc_utils.cpp b/media/libstagefright/avc_utils.cpp
index cbdb816..9ca43f9 100644
--- a/media/libstagefright/avc_utils.cpp
+++ b/media/libstagefright/avc_utils.cpp
@@ -414,7 +414,10 @@
     const uint8_t *nalStart;
     size_t nalSize;
     while (getNextNALUnit(&data, &size, &nalStart, &nalSize, true) == OK) {
-        CHECK_GT(nalSize, 0u);
+        if (nalSize == 0u) {
+            ALOGW("skipping empty nal unit from potentially malformed bitstream");
+            continue;
+        }
 
         unsigned nalType = nalStart[0] & 0x1f;