[FFmpeg-cvslog] avcodec/alsdec: Add FF_CODEC_CAP_INIT_CLEANUP
Michael Niedermayer
git at videolan.org
Mon Jul 8 14:09:26 EEST 2019
ffmpeg | branch: release/4.1 | Michael Niedermayer <michael at niedermayer.cc> | Fri Jun 21 00:47:19 2019 +0200| [c34512371e1d09a1862a3c7f53a17b3e9198729a] | committer: Michael Niedermayer
avcodec/alsdec: Add FF_CODEC_CAP_INIT_CLEANUP
Fixes: multiple memleaks
Fixes: 15293/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-5642409288925184
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit b7b6ddd59693008c35b3247496ecc946331d0856)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c34512371e1d09a1862a3c7f53a17b3e9198729a
---
libavcodec/alsdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index e38d7b21d3..5eb2a58aaf 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -2127,7 +2127,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
return 0;
fail:
- decode_end(avctx);
return ret;
}
@@ -2153,4 +2152,5 @@ AVCodec ff_als_decoder = {
.decode = decode_frame,
.flush = flush,
.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};
More information about the ffmpeg-cvslog
mailing list