The branch, master has been updated
via 61b6877637041a1f817ad9811c839b0feae2b8af (commit)
from 1a02412170144f07711428ddc2d1051c4284ee0a (commit)
- Log -----------------------------------------------------------------
commit 61b6877637041a1f817ad9811c839b0feae2b8af
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Sep 11 20:12:55 2025 +0200
Commit: michaelni <[email protected]>
CommitDate: Thu Oct 2 12:52:43 2025 +0000
avcodec/mjpegdec: Explain buf_size/width/height check
Suggested-by: Ramiro
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index b829ab682b..69bc003490 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -340,6 +340,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height);
if (av_image_check_size(width, height, 0, s->avctx) < 0)
return AVERROR_INVALIDDATA;
+
+ // A valid frame requires at least 1 bit for DC + 1 bit for AC for each
8x8 block.
if (s->buf_size && (width + 7) / 8 * ((height + 7) / 8) > s->buf_size *
4LL)
return AVERROR_INVALIDDATA;
-----------------------------------------------------------------------
Summary of changes:
libavcodec/mjpegdec.c | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
