highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/webp: Fix null pointer dereference

Browse Source 
Fixes: 1369/clusterfuzz-testcase-minimized-5048908029886464

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9bf4523e40148fdd27064ab570952bd8c4d1016e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-05-06 16:43:52 +02:00
parent 88a3e4c34e
commit 28c618355c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/webp.c
View File

@ -1342,6 +1342,8 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
pkt.size = data_size; pkt.size = data_size;
ret = ff_vp8_decode_frame(avctx, p, got_frame, &pkt); ret = ff_vp8_decode_frame(avctx, p, got_frame, &pkt);
if (ret < 0)
return ret;
if (s->has_alpha) { if (s->has_alpha) {
ret = vp8_lossy_decode_alpha(avctx, p, s->alpha_data, ret = vp8_lossy_decode_alpha(avctx, p, s->alpha_data,
s->alpha_data_size); s->alpha_data_size);