commit c2f0c73bfcf36219f446e3eef9effe49a3a415a5
author Marco Nelissen <marcone@google.com> Fri Jan 06 13:57:51 2017 -0800
committer Marco Nelissen <marcone@google.com> Fri Jan 13 08:34:43 2017 -0800
tree 1716a6c4990b908c6f9981f0dc01f1668fd63b2e
parent b47a5ab10732758aa84a064a0729314f3897d802

Don't CHECK when buffer is too large

Bug: 31647370
Test: ran CTS test with and without patch
Change-Id: I4e3a37aabc9387432671c1c0c469241142612cc4

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 9e72eb7..5dfbe5b 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2987,7 +2987,11 @@
             static const uint8_t kNALStartCode[4] =
                     { 0x00, 0x00, 0x00, 0x01 };
 
-            CHECK(info->mSize >= specific->mSize + 4);
+            if (info->mSize < specific->mSize + 4) {
+                ALOGE("info size %zu < specific size %zu", info->mSize, specific->mSize + 4);
+                setState(ERROR);
+                return false;
+            }
 
             size += 4;
 
@@ -2995,7 +2999,11 @@
             memcpy((uint8_t *)info->mData + 4,
                    specific->mData, specific->mSize);
         } else {
-            CHECK(info->mSize >= specific->mSize);
+            if (info->mSize < specific->mSize) {
+                ALOGE("info size %zu < specific size %zu", info->mSize, specific->mSize);
+                setState(ERROR);
+                return false;
+            }
             memcpy(info->mData, specific->mData, specific->mSize);
         }