diff options
| author | Chris Craik <ccraik@google.com> | 2017-01-12 22:02:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-12 22:02:25 +0000 |
| commit | a24991c48f0bf8562cf64db52376afd1a5b2174d (patch) | |
| tree | 2a5e19bbd3aee9255e758ac0ecb779328ffd9e14 /framesequence | |
| parent | 97393adb08c55fc9c6ebf54ef8f6feb6803211b8 (diff) | |
| parent | f597bbffa63b7aab1c6fb82cc8b0997ca64a0e99 (diff) | |
| download | ex-a24991c48f0bf8562cf64db52376afd1a5b2174d.tar.gz | |
resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe
am: f597bbffa6
Change-Id: I21956c8ea41beef73447ab3bacd82ff55086b88d
Diffstat (limited to 'framesequence')
| -rw-r--r-- | framesequence/jni/FrameSequence_webp.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/framesequence/jni/FrameSequence_webp.cpp b/framesequence/jni/FrameSequence_webp.cpp index 18568dae..f1bae82f 100644 --- a/framesequence/jni/FrameSequence_webp.cpp +++ b/framesequence/jni/FrameSequence_webp.cpp @@ -105,6 +105,10 @@ FrameSequence_webp::FrameSequence_webp(Stream* stream) 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); |