aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-06 16:43:52 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-06 16:44:25 +0200
commit9bf4523e40148fdd27064ab570952bd8c4d1016e (patch)
tree7556d1f49cbd1061eb15d89a1e6980a6760d79e3
parent12936a4585bc293c0f88327d6840f49e8e744b62 (diff)
downloadffmpeg-9bf4523e40148fdd27064ab570952bd8c4d1016e.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>
-rw-r--r--libavcodec/webp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 52a80402e9..d21536a286 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);