From cac7efdfaa4fa795d391fd078aeef94097e46512 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 9 Nov 2025 16:39:45 +0100 Subject: [PATCH] avcodec/exr: Handle axmax like bxmin in 04d7a6d3db56ea1a93908ff2d3d312e3fc40a58c Fixes: out of array access Fixes: 418335931/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_DEC_fuzzer-6718455383654400 Fixes: 471611870/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_DEC_fuzzer-6645447302381568 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit 33b3dbaf1530b4a8f86a5063e059c4b54c497fcc) Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 87e971d19c..77c0b24f39 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1485,7 +1485,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata, } // Zero out the end if xmax+1 is not w - memset(ptr_x, 0, axmax); + if (s->desc->flags & AV_PIX_FMT_FLAG_PLANAR || !c) + memset(ptr_x, 0, axmax); channel_buffer[c] += td->channel_line_size; } }