This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 0d59620bff074da047ac6a5193cfb8fdd39cef2e Author: Michael Niedermayer <[email protected]> AuthorDate: Sat Feb 7 00:49:37 2026 +0100 Commit: Michael Niedermayer <[email protected]> CommitDate: Sun Feb 15 20:09:54 2026 +0100 avcodec/bmp: Move picture allocation after some checks Fixes: Timeout Fixes: 479872424/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BMP_DEC_fuzzer-5311478919135232 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> --- libavcodec/bmp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 9e9f62d91e..db5d704057 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -207,9 +207,6 @@ static int bmp_decode_frame(AVCodecContext *avctx, AVFrame *p, return AVERROR_INVALIDDATA; } - if ((ret = ff_get_buffer(avctx, p, 0)) < 0) - return ret; - buf = buf0 + hsize; dsize = buf_size - hsize; @@ -225,6 +222,8 @@ static int bmp_decode_frame(AVCodecContext *avctx, AVFrame *p, } av_log(avctx, AV_LOG_ERROR, "data size too small, assuming missing line alignment\n"); } + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; // RLE may skip decoding some picture areas, so blank picture before decoding if (comp == BMP_RLE4 || comp == BMP_RLE8) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
