commit 798b6244999a799742218dea267b7dca35afc1b7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 06 22:58:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 06 22:58:14 2018 +0000
tree f42630716c681c7541b838e1dc572a5b641d861f
parent 4c97418e2bf315744dca6c6dd7ad0cdebf83a184
parent 620b68f69dbfcf3f5bed13f7d1a102f77588597d

Merge "Check NAL size before looking inside"

media/libstagefright/foundation/avc_utils.cpp

diff --git a/media/libstagefright/foundation/avc_utils.cpp b/media/libstagefright/foundation/avc_utils.cpp
index b58474c..8414af3 100644
--- a/media/libstagefright/foundation/avc_utils.cpp
+++ b/media/libstagefright/foundation/avc_utils.cpp
@@ -351,7 +351,7 @@
     const uint8_t *nalStart;
     size_t nalSize;
     while (getNextNALUnit(&data, &size, &nalStart, &nalSize, true) == OK) {
-        if ((nalStart[0] & 0x1f) == nalType) {
+        if (nalSize > 0 && (nalStart[0] & 0x1f) == nalType) {
             sp<ABuffer> buffer = new ABuffer(nalSize);
             memcpy(buffer->data(), nalStart, nalSize);
             return buffer;