From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 9402A40230 for ; Thu, 11 Sep 2025 18:21:34 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'MbQPHHdE8AoSMjaa5qn6qD6O5deqg2qp1tN0rAhZPPQ=', expected b'Tk35FBJcpj8q6wyCQtQYU6AThwiCNvBJuP4WqiSnXi0=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757614876; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=MbQPHHdE8AoSMjaa5qn6qD6O5deqg2qp1tN0rAhZPPQ=; b=30Fa0Ax2mFsGpWHrCoUQ+Kzr+PqbQJ8qYU9UC7jV3zAB+c5d2N75lITiG+fS61LZoJw3y ApkBcC9hgXpT6rUM3iYrLN2XeRjNQPusVkd37b7tA0ki3TbuG288pUzwv2yF5wAcqSHtpKw x/azD0uYH4yQ4X7uce03TEWgiMfkCFq34eeP5YEsG+8O8aUpXjjYYz8HzY82JcPydSmZer+ bsRwLcdxI3wwY8Qkpk9qhA2Ap2HCK5VpTbczTbZaqgX/pnLq5I2KYRCz3KHDiS00QTrJCim ivsngopsneAJFJ1up+EklMV6HKrxIxkQfl01dfuj8G7/cRxh0/10yBs3B/Kw== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 31E4468E7E1; Thu, 11 Sep 2025 21:21:16 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757614874; b=tfEywZERHz2AvFTIbG6nV2Cz6+8HbPak0qNVTHevd1lPPvGD+X8sfegliPDYuXK4UjonE 54kbGQKmazlnWrchGpQ/ThxztLXmz1FVqkdBuvT+Jc1QxhTm65rOyGagJ1O46V1x3wjGJx5 rXDDeHau/V9BpJ2KdKylQWGJd5Wap0PKk+a9s6cG1nqtAtVyuhjfW0ZswqnVCw+CibDVm2L gV6qmUja0qeDOK+6iBeILszAg5t/gR79hr7fIVlgZWR7Sh0y0E8rRbmSA9b5XszGmTPyQB2 x17NPwUP1ZXWjk6QOexj3NEglFEbr+p+YJFTtkAtspAOySpjfpyZpQCvLTmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757614874; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=ZzPIjPhnFb7uEPJ0phBlZJ30Rnky5DiCPD/3/gRoYJ4=; b=YB8uvB4LuVK1DNGG8oIpXWuD8FNxCopB0YaTqJ8wGO6u+vZSpEDOeVmz2HC+xH5kjKECj ORtDV/wvCCwjdgOULRYTAPV9GHeAaBQRWQOmGaws1NeTg0ZfKrvbn9g77fN1NdH0AyOF5No Mx/Jj7DHG/BycBZLks+ZHytwwC/N+/NE3svLERmPH+GkORXvXHbXaUA7XxbLbiCIhhaP7LP lxtUTEEk3pcP3SHWhvxcFky0pH9ST3PI/fIxqKG0low5E73GSHM9GH9ohBe+F/ruIIJKEiN e/6KZC3EleeMcpWcgqAN1mQA/Ikuhwmm9nhwHM3/mR486v6QZfCa5WEutAEA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757614864; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=Tk35FBJcpj8q6wyCQtQYU6AThwiCNvBJuP4WqiSnXi0=; b=tXDp+8vfeM0eRId98OwnfHPAF16doTXNoa/dmLE4X8CqPDqlv8qPetdC/vjkXGm6jBIbL i0XKX/lp6AV/EPvdvV/pQalxE+dANja9c6SNKQYLAHMWfcJ5w7GkC6gfRM7yeSX8QBq46QU /im7YzzroGXJHfHYNDqFoN6PSURKonl1+CqmOZT2Ormt9DJGXb5cRjrvXb66hmqJB8nVpYy WoVEe21693OAoPrJZimXgoLkEgMC/d91Hv696rtakdMUDAq0ON0dy27Qw9CvsnmZL8LgFCO 3YSfrX9rFiIlxu65zNbHb1Og4r/ISDLoe5/Nz+hZkxEnBNbvxncS672G0WXw== Received: from 3f9d35a0eedc (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 644C568E6D0 for ; Thu, 11 Sep 2025 21:21:04 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Sep 2025 18:21:03 -0000 Message-ID: <175761486486.25.8878584279724610785@463a07221176> Message-ID-Hash: OFYQXY5LVLKJEVEXKXY47NA46YOSVBTT X-Message-ID-Hash: OFYQXY5LVLKJEVEXKXY47NA46YOSVBTT X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: Explain buf_size/width/height check (PR #20495) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: michaelni via ffmpeg-devel Cc: michaelni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20495 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20495 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20495.patch Suggested-by: Ramiro Signed-off-by: Michael Niedermayer >>From 16ba3a971069e4013ff86229df4a9a1d30d12074 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 11 Sep 2025 20:12:55 +0200 Subject: [PATCH] avcodec/mjpegdec: Explain buf_size/width/height check Suggested-by: Ramiro Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 3dde759fea..76a98bb521 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -342,6 +342,9 @@ 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; + + // can the smallest valid representation (of blank 8x8 blocks) be in buf_size ? + // if thats not possible than this cannot be a valid frame if (s->buf_size && (width + 7) / 8 * ((height + 7) / 8) > s->buf_size * 4LL) return AVERROR_INVALIDDATA; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org