highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/tiff: Set FF_CODEC_CAP_INIT_CLEANUP

Browse Source 
Fixes: memleaks
Fixes: 17813/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5145600206569472

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-10-02 21:14:17 +02:00
parent 2f588ccfb7
commit 379e5d29d5
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/tiff.c
View File

@@ -2090,8 +2090,6 @@ static av_cold int tiff_init(AVCodecContext *avctx)
s->avctx_mjpeg->idct_algo = avctx->idct_algo; s->avctx_mjpeg->idct_algo = avctx->idct_algo;
ret = ff_codec_open2_recursive(s->avctx_mjpeg, codec, NULL); ret = ff_codec_open2_recursive(s->avctx_mjpeg, codec, NULL);
if (ret < 0) { if (ret < 0) {
av_frame_free(&s->jpgframe);
avcodec_free_context(&s->avctx_mjpeg);
return ret; return ret;
} }
@@ -2142,5 +2140,6 @@ AVCodec ff_tiff_decoder = {
.decode = decode_frame, .decode = decode_frame,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(tiff_init), .init_thread_copy = ONLY_IF_THREADS_ENABLED(tiff_init),
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.priv_class = &tiff_decoder_class, .priv_class = &tiff_decoder_class,
}; };