| Message ID | 20191216231946.11260-4-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 3ee9240be3e4044ae9e60a9a3a68820bf8075299 |
| Headers | show |
On Tue, Dec 17, 2019 at 12:19:45AM +0100, Michael Niedermayer wrote: > 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> > --- > libavcodec/vc1dec.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) will apply [...]
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index ac3198e4fd..d2f25fabec 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
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> --- libavcodec/vc1dec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)