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 7CC2A44B0A for ; Fri, 19 Dec 2025 18:56:20 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'YBBgRHf2sH9PMQHmhRSBy41X2iokm561G/qvJeV9ZmU=', expected b'ytXLZ8QoiLUA1ucA2dbBIkTMHYRqHEMdtVP+1clY2qw=')) 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=1766170567; 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=YBBgRHf2sH9PMQHmhRSBy41X2iokm561G/qvJeV9ZmU=; b=3lzpO1MK6oTvJ0FBpwoukUUG7GGkXVw5p+IWrhEYzXl+0QkHzhFOPehGG3vhpJ0GSM7fQ LKLq22bCVKQK3w20bN0f1WP9VDlaYWU5OQu29diOX+zjc4HbFVutTbWp9zwWYaJTPdanBfW EbTAKaw6ua9mU3xM4gy7xOBColNiKxApnRPT1g54BtFD0gfbQMxgnnkP6XZJEv6kiRbWXpp Vb+loS9c8DwKJtJKsVQFw70fBYcpUrvrKSM21/Zpqz7KVh9xmAHh5YfMdBAI+Wmvg/Jgx7s G+coiBJ11w6/DZKVDqRO3zxl7hC/E459GvVS8/udlebD3O0/0V8SslCiIxNA== Received: from [172.20.0.2] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id C5AEB690A11; Fri, 19 Dec 2025 20:56:07 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1766170556; b=Gy02dVP27lDG5cj6LEOJEHnfKwry2EcwpWoX/Yvb8VD0Dako7if2+pidMUuPMDy+nxmn/ MKeAXvG9X52/wY+JPZ6qTXlzeisrw02morQzmaylCpQwESARWa34UPsgjXcc+YpsCrIPhWD LfkNXhHoWBTd5aJqKk5uSit63cG4tVPHaXuGcMv1BpuGC/TmJgJO4PZi0bk34luf8AUDgID VSJme6hISbxqguSfxAnrsarOa1dn0KijGR/O3CLCR649ol2QRQfgRQ6RGczqga5PhB3R4Xj ChniXFBc2+eIRUP2il9KOab5I7v0L1kJGpP3YMIELDMbEY4kPSVQjqiN6v8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1766170556; 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=IfcHM29X6Cly2tcNGiuSsnJuZhchqApyXuA72Flgx+0=; b=VWopmAzmMZroV+Co7tKE2B0u+cIuir/ZygWApaYvG9uGdUNVguwo9poF8zDikmyZwOMS1 r2U1GlaRXYab5Z6buXGVVOd5I1yNm4K1eV/hP4qTm9CEA8E41i7GQBG5iMfFcmuQZba+qTc 8GDTjgp+H1Muhqa/aMamez6RvC4HQ++J62UnKg3F2zXR842lNR4uxFB0StmbNwqCBGJyews 3davTPPSIgZqjiLjWNFvRKyoiiF5Fe3a1oSOYlIgCP+Pl4nGiAwYLdNThAjuEgR4lawSgUq PLBluAL1cyxVBlnE2g48t7ZGP+51UudqDXdJNonnx1HDECSrRoQKP4O9iCMw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766170547; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=ytXLZ8QoiLUA1ucA2dbBIkTMHYRqHEMdtVP+1clY2qw=; b=Hwi+KHieC+fPjiJ1Av6lqPRQ0/PD9DweFKUZtqfwjmTgB4j96kjm5iWRG/mCORptPn+ks 2kPWOuHOBcOEHxMdVJiiHeUIC/Lj6qL3dXQCMAY0L5+NwRJHGo3ee6lFRhlL4toVHFO3eg3 9hJYMAId9qikJIToOb3VFiTqd8AVjoF1Ge2dHNZHUGzoXJ76sjd4jggDEadr1YcYwtKBByO NmxBP3fYzS67FibaTJqx3UeV/QoMRX26SAyGPUGepr3ISvw2mOLvtvlNIpY9Oaq8o72wjmw mGtMnXnVy0DBHH8jedkh7P33YFw7h6gzRwZTWfoV3hvmgKxS9Bu6374enoBw== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id BD5C96909C6 for ; Fri, 19 Dec 2025 20:55:47 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Dec 2025 18:55:47 -0000 Message-ID: <176617054794.60.3946238523313385887@2cb04c0e5124> Message-ID-Hash: 4DNM4B7KNT7I5BT7TFMVADH744PSWA3P X-Message-ID-Hash: 4DNM4B7KNT7I5BT7TFMVADH744PSWA3P X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation 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 X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: Size bound is for sequectial mjpeg (PR #21245) 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 #21245 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21245 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21245.patch Fixes: issue21225 The testcase 6381/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5665032743419904 still exits within 240ms Signed-off-by: Michael Niedermayer Fixes: https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/21225 >>From 9c0c21a8acaaf45a4598329395436105695b9803 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 19 Dec 2025 19:45:56 +0100 Subject: [PATCH] avcodec/mjpegdec: Size bound is for sequectial mjpeg Fixes: issue21225 The testcase 6381/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5665032743419904 still exits within 240ms Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 4d7cdfde12..05150e982c 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -340,9 +340,11 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) 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; + if (!s->progressive && !s->ls) { + // 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; + } nb_components = get_bits(&s->gb, 8); if (nb_components <= 0 || -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org