resolve merge conflicts of 89cdd4cb to mnc-dev
Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207
(cherry picked from commit d2fd12358d35eb999ef8b92b1dcce07f7be15fc3)
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);