This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/6.1 in repository ffmpeg.
commit b8c5d2a85f166d7cb0ad51f3e6fc58970e72e7da Author: Michael Niedermayer <[email protected]> AuthorDate: Tue Jun 2 02:56:17 2026 +0200 Commit: Michael Niedermayer <[email protected]> CommitDate: Sun Jun 14 20:00:25 2026 +0200 avcodec/jpeglsdec: only apply color transform to decoded rows Fixes: Timeout Fixes: 503996733/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_DEC_fuzzer-4948713016721408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3669a742dda9404af26c3ec10b6dd2237a6fa7c5) Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit f6b60eed07b96ac01473b24df85eb764e1f1638e) --- libavcodec/jpeglsdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index c245cf0279..cf53749ae4 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -494,7 +494,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, if (s->bits <= 8) { uint8_t *src = s->picture_ptr->data[0]; - for (i = 0; i < s->height; i++) { + for (i = 0; i < decoded_height; i++) { switch(s->xfrm) { case 1: for (x = off; x + 2 < w; x += 3) { _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
