diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 7e15e18..9774ae0 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2851,7 +2851,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;
 
@@ -2859,7 +2863,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);
         }