commit | 6da377d8508b32499359e30ffd7635d2094a8068 | [log] [tgz] |
---|---|---|
author | Chris Craik <ccraik@google.com> | Tue Jan 10 15:09:08 2017 -0800 |
committer | Brian Young <bcyoung@google.com> | Tue Jan 24 21:53:34 2017 +0000 |
tree | 02187624009d3463b6a9e3529673ddcd2b2b6fde | |
parent | 2df264dca7e676e9eaf03bb6152a41eef809b07a [diff] |
Handle small sized webps correctly bug:33718716 Change-Id: I54d63d54c7057828dfca1ab4ef47a44760e94ece
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);