[FFmpeg-devel] [PATCH 4/5] avcodec/vc1dec: Free sprite_output_frame on error
Michael Niedermayer
michael at niedermayer.cc
Tue Dec 17 01:19:45 EET 2019
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 at niedermayer.cc>
---
libavcodec/vc1dec.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
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
--
2.24.0
More information about the ffmpeg-devel
mailing list