summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-12-16 23:31:22 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-28 11:20:48 +0100
commit3ee9240be3e4044ae9e60a9a3a68820bf8075299 (patch)
treee13392a7c8aa1ca4aa5583ee492df63d20d5941e /libavcodec/vc1dec.c
parentd5e7f01090a0b738e3df4323910875151f7dbb94 (diff)
avcodec/vc1dec: Free sprite_output_frame on error
Fixes: memleaks Fixes: 19471/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1IMAGE_fuzzer-5688035714269184 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r--libavcodec/vc1dec.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index d1ca2afb4b..239f46794c 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -576,14 +576,21 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
if (v->sprite_width > 1 << 14 ||
v->sprite_height > 1 << 14 ||
v->output_width > 1 << 14 ||
- v->output_height > 1 << 14) return -1;
+ v->output_height > 1 << 14) {
+ ret = -1;
+ goto error;
+ }
if ((v->sprite_width&1) || (v->sprite_height&1)) {
avpriv_request_sample(avctx, "odd sprites support");
- return AVERROR_PATCHWELCOME;
+ ret = AVERROR_PATCHWELCOME;
+ goto error;
}
}
return 0;
+error:
+ av_frame_free(&v->sprite_output_frame);
+ return ret;
}
/** Close a VC1/WMV3 decoder