diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 16:43:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:33 +0200 |
| commit | ff27d173489c52fb8a3bcfc65257111e9b721314 (patch) | |
| tree | 552f1382851166d5728b3ce2c8ff1b8e0893354e | |
| parent | 1951a44d77d21cb93d43e00eee432b24b8bba82a (diff) | |
| download | ffmpeg-ff27d173489c52fb8a3bcfc65257111e9b721314.tar.gz | |
avcodec/webp: Fix null pointer dereference
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>
| -rw-r--r-- | libavcodec/webp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 5c2961ff19..a3b1fad6cd 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1342,6 +1342,8 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p, pkt.size = data_size; ret = ff_vp8_decode_frame(avctx, p, got_frame, &pkt); + if (ret < 0) + return ret; if (s->has_alpha) { ret = vp8_lossy_decode_alpha(avctx, p, s->alpha_data, s->alpha_data_size); |