Commit f6179e23 authored by Michael Niedermayer's avatar Michael Niedermayer

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/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3ee9240b)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent a35b01b8
...@@ -572,14 +572,21 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) ...@@ -572,14 +572,21 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
if (v->sprite_width > 1 << 14 || if (v->sprite_width > 1 << 14 ||
v->sprite_height > 1 << 14 || v->sprite_height > 1 << 14 ||
v->output_width > 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)) { if ((v->sprite_width&1) || (v->sprite_height&1)) {
avpriv_request_sample(avctx, "odd sprites support"); avpriv_request_sample(avctx, "odd sprites support");
return AVERROR_PATCHWELCOME; ret = AVERROR_PATCHWELCOME;
goto error;
} }
} }
return 0; return 0;
error:
av_frame_free(&v->sprite_output_frame);
return ret;
} }
/** Close a VC1/WMV3 decoder /** Close a VC1/WMV3 decoder
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment