ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed Sep 20 01:07:58 2023 +0200| [53948d6200479d25cf0d82c1e7f7cf50eebdc6ff] | committer: Michael Niedermayer
avcodec/utvideodec: move allocation to the end of init Fixes: mem leak Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_UTVIDEO_fuzzer-6666804266926080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53948d6200479d25cf0d82c1e7f7cf50eebdc6ff --- libavcodec/utvideodec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 16f51e4b47..ce5d00f7af 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -1012,10 +1012,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } - c->buffer = av_calloc(avctx->width + 8, c->pro?2:1); - if (!c->buffer) - return AVERROR(ENOMEM); - av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &h_shift, &v_shift); if ((avctx->width & ((1<<h_shift)-1)) || (avctx->height & ((1<<v_shift)-1))) { @@ -1063,6 +1059,10 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } + c->buffer = av_calloc(avctx->width + 8, c->pro?2:1); + if (!c->buffer) + return AVERROR(ENOMEM); + return 0; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
