commit f597bbffa63b7aab1c6fb82cc8b0997ca64a0e99
author Chris Craik <ccraik@google.com> Thu Jan 12 22:00:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 12 22:00:24 2017 +0000
tree c031169e1c500b3d684d591e0f6c206dd2ff3b85
parent 589067bb9dbc1e18cc64e6255abccfcbe8224aba
parent d3a5ff7bfeb361e8d2e808a2c8c5b864a181d5f7

resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d
am: d3a5ff7bfe

Change-Id: Ifeba807b84a2d18184eb330c21cdfc1808ffdbdb

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);