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