commit 0277976e8118ac493440049affeb1fce1f08598e
author Sheng-hao Tsao <shenghao@google.com> Wed May 04 06:39:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 04 06:39:49 2016 +0000
tree b2ff3fd08b42b6fb20bcd2504703a9a6daed42a0
parent b2e7ceb874b7fe5a6c1b3a72a42f09969edf445f
parent 075999616e5764462316f31ce628146c1174b1d5

Merge "Allow RGBX8888 in soft video encoder" into nyc-dev

media/libstagefright/mpeg2ts/ATSParser.cpp

diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp
index b8248c4..b863d67 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.cpp
+++ b/media/libstagefright/mpeg2ts/ATSParser.cpp
@@ -1734,6 +1734,13 @@
     unsigned sectionLength = U16_AT(data + 1) & 0xfff;
     ALOGV("sectionLength %u, skip %u", sectionLength, mSkipBytes);
 
+
+    if(sectionLength < mSkipBytes) {
+        ALOGE("b/28333006");
+        android_errorWriteLog(0x534e4554, "28333006");
+        return false;
+    }
+
     // Skip the preceding field present when payload start indicator is on.
     sectionLength -= mSkipBytes;