Handle small sized webps correctly
fix merge conflict into nyc-bugfix-release
bug:33718716
Change-Id: I54d63d54c7057828dfca1ab4ef47a44760e94ece
(cherry picked from commit 51b23ccc575bcc31b68e97f71089636d551e9a25)
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);