aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-07-07 11:05:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-07-19 21:42:38 +0200
commit76af425159cfa0c09b85d5c763ffa9942c940bfc (patch)
tree5bd1a1b64cb8ffe8ad9531378dddb2e1c756a8be
parent5c46fdf305caac8bf2f270e69e60ae3d614df468 (diff)
downloadffmpeg-76af425159cfa0c09b85d5c763ffa9942c940bfc.tar.gz
avcodec/flashsv: add FF_CODEC_CAP_INIT_CLEANUP to flashsv1
Fixes: memleaks on error paths during init Fixes: 15533/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLASHSV_fuzzer-5647977168764928 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/flashsv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 1dc3c710dc..45846bb3df 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -132,7 +132,6 @@ static av_cold int flashsv_decode_init(AVCodecContext *avctx)
s->frame = av_frame_alloc();
if (!s->frame) {
- flashsv_decode_end(avctx);
return AVERROR(ENOMEM);
}
@@ -518,6 +517,7 @@ AVCodec ff_flashsv_decoder = {
.close = flashsv_decode_end,
.decode = flashsv_decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
};
#endif /* CONFIG_FLASHSV_DECODER */