diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 16:43:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 00:21:49 +0200 |
| commit | 28c618355c9f4e61d3f30ad831eadb74a7e3fd1d (patch) | |
| tree | 64929c285fffe8d8a9d36c178b9bb86e5e8c8001 | |
| parent | 88a3e4c34e2af96c4d31b56090f8bfe95de2d68a (diff) | |
| download | ffmpeg-28c618355c9f4e61d3f30ad831eadb74a7e3fd1d.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 45abfdc3ca..7d23cc7435 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); |