commit dda9763117645b62cee85313b9fef7d46c47cdd0
author Robert Shih <robertshih@google.com> Mon Jan 30 20:04:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 30 20:04:12 2017 +0000
tree 5748e327b1c24dfef91d6c344f267ad3a113c75f
parent 99b29882e4148cd7c3bb20d02e0037ed60b4e9b5
parent 4fa55ddad0519c53a2d7b8dfb78b87905ae6798f

avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c
am: 4fa55ddad0

Change-Id: Id43dff53b311aef4f5f24242f3278dffb111baa7

media/libstagefright/avc_utils.cpp

diff --git a/media/libstagefright/avc_utils.cpp b/media/libstagefright/avc_utils.cpp
index 0396dc6..763381e 100644
--- a/media/libstagefright/avc_utils.cpp
+++ b/media/libstagefright/avc_utils.cpp
@@ -456,7 +456,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;