commit 6e5ef73033bbdea8f2bd80885b4c9722b5850384
author Dongwon Kang <dwkang@google.com> Sat Jun 17 05:00:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jun 17 05:00:38 2017 +0000
tree 47360428bc3a9d2e5ea37a339d9618e3ebaae5ea
parent 41c60ea30ed60c59441a8e1728ce181d4397af4d
parent 040485c1bcd8f22ca6f7c45d934a2e90ec48a231

Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am: d971d18873 am: 2ace148c06 am: 18a671762d am: 6ce4126a09
am: 040485c1bc

Change-Id: I0feb497a42b3e2d10a1f226da308c29b0da46c81

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 0996cdf..f0c633b 100755
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2753,6 +2753,13 @@
         }
         case FOURCC('y', 'r', 'r', 'c'):
         {
+            if (size < 6) {
+                delete[] buffer;
+                buffer = NULL;
+                ALOGE("b/62133227");
+                android_errorWriteLog(0x534e4554, "62133227");
+                return ERROR_MALFORMED;
+            }
             char tmp[5];
             uint16_t year = U16_AT(&buffer[4]);
 
@@ -2775,6 +2782,8 @@
 
         // smallest possible valid UTF-16 string w BOM: 0xfe 0xff 0x00 0x00
         if (size < 6) {
+            delete[] buffer;
+            buffer = NULL;
             return ERROR_MALFORMED;
         }