commit 0945199000aaa5a628705de69f17d28a5c04cc36
author Marco Nelissen <marcone@google.com> Tue Jan 12 23:05:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 12 23:05:22 2016 +0000
tree 38a63743f2f733f2e842c8a8cf4e6d135a632787
parent 9cebd7cfba272117522617661cf9d4985880921e
parent 2304c606eb2eb9e6f21fcca0e6dcd4ac8156779a

Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1
am: 2304c606eb

* commit '2304c606eb2eb9e6f21fcca0e6dcd4ac8156779a':
  Fix out-of-bounds write

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 2c472dc..8c3f87c 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -4307,7 +4307,15 @@
                     continue;
                 }
 
-                CHECK(dstOffset + 4 <= mBuffer->size());
+                if (dstOffset > SIZE_MAX - 4 ||
+                        dstOffset + 4 > SIZE_MAX - nalLength ||
+                        dstOffset + 4 + nalLength > mBuffer->size()) {
+                    ALOGE("b/26365349 : %zu %zu", dstOffset, mBuffer->size());
+                    android_errorWriteLog(0x534e4554, "26365349");
+                    mBuffer->release();
+                    mBuffer = NULL;
+                    return ERROR_MALFORMED;
+                }
 
                 dstData[dstOffset++] = 0;
                 dstData[dstOffset++] = 0;