commit 7c824f17b3eea976ca58be7ea097cb807126f73b
author Chris Craik <ccraik@google.com> Thu Jan 12 12:56:20 2017 -0800
committer android-merger <android-merger@vpba3.mtv.corp.google.com> Thu Jan 19 16:54:06 2017 -0800
tree c031169e1c500b3d684d591e0f6c206dd2ff3b85
parent 30ee0df2a9066ef3d2ab7039a37cbc03c96a935e

resolve merge conflicts of 89cdd4cb to mnc-dev

Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207

framesequence/jni/FrameSequence_webp.cpp

diff --git a/framesequence/jni/FrameSequence_webp.cpp b/framesequence/jni/FrameSequence_webp.cpp
index 034847a..aa99b90 100644
--- a/framesequence/jni/FrameSequence_webp.cpp
+++ b/framesequence/jni/FrameSequence_webp.cpp
@@ -105,6 +105,10 @@
             return;
         }
         mData.size = CHUNK_HEADER_SIZE + readSize;
+        if(mData.size < RIFF_HEADER_SIZE) {
+            ALOGE("WebP file malformed");
+            return;
+        }
         mData.bytes = new uint8_t[mData.size];
         memcpy((void*)mData.bytes, riff_header, RIFF_HEADER_SIZE);