From patchwork Wed May 8 02:39:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48651 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9c99:b0:1af:836d:81b3 with SMTP id mj25csp275504pzb; Tue, 7 May 2024 19:39:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7ntQXetzWh+bapfcfpDedhEARdol110DjU0KPXwTHeNfcIj2HSINKEIoKVcuzpq4/roqdBVDgRisxKAZgwmAsycTAY95fCssG+w== X-Google-Smtp-Source: AGHT+IGHR4NbISIS7x1xOTQB2Ocoi7y5aOg97OZU0hZb5x7dabhzYpA/7KheL+T2gngI+a/d9wMd X-Received: by 2002:a19:8c46:0:b0:51b:abbf:7585 with SMTP id 2adb3069b0e04-5217d438762mr611412e87.5.1715135976945; Tue, 07 May 2024 19:39:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715135976; cv=none; d=google.com; s=arc-20160816; b=pFLQsWqCb8So6Fkwynr8nc2r0xo1WyiO1KHDIRMbeVwmnMIUXwEOVDdbydttpkt4cI ntShhxlAvlbkWFCsLTsonp5dsGR+MyLNwKeF/5WH8Smkv9vvrzedYVtKEBbOuZ+14a3s N7YDHZsvxdSCGDMgzMHnioDAyeq9k/3ome/XVXLnsDwM/LnHoyK9AeshXSvjsliY+fvy QoFjdH3Xaq8f7ebT+2WlDvsdWNAvSUlpqQxlzk575HXBNI0O9T14eNFxv/fDui8rnHLb Y6ldpyXmrLFyeip4SJz1VQatAPimVRy9IkWMyf+8Wjbyuq3u1VoiNHXEERXFisBXsv72 8gUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=IpUyXONY6tLnDX3ToxM5O/XwQ5H4NQ+llpXJjZaAQBc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=YcjlHwwB/E6ijwEQUCeAz8FK9jOm+367e+zaYwJFVF3b2RvXFYxw6qAAOmHu65VOY1 uoj+wuCQf5MJ0uTOB+fEMBfOlS/utM2tlVNSfzl6jBavbByPQh9eO+v10+8IBSpmQAXl b4a+ipoDLV5togV73yPHl/b0Lc8/hvXDma+FRKd7IDbf5tMt4eXlRINCp0sZqEEuaVsU 3VF+MTxtRN2PXwwJGsd+w+QIjTG6GQYhAk1WjtbLSHmiBZHbnOUaUOOgV8snIMnkm8Oh ojCg57z9MnPA3gxBu6SREr8cIov81ezkZX1mAlfIUMBWZgDiyCVYckrAqocX4NsIjEya nKYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=f+qyzLM1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cm28-20020a170906f59c00b00a59a1e50b19si4875146ejd.449.2024.05.07.19.39.36; Tue, 07 May 2024 19:39:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=f+qyzLM1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8AB168CEBC; Wed, 8 May 2024 05:39:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90E8C68A304 for ; Wed, 8 May 2024 05:39:25 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 86BF01C0003 for ; Wed, 8 May 2024 02:39:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1715135964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WiPU1KdNNds6kXYGSlEZFwuzeg7cTrw1Xfn36wUBkYw=; b=f+qyzLM1r2jjZVeUZLYtiU8GM7Ne4j72phVrLVO9ZTEutl+ASceuxdTMXlyvfq2O5H5Qm5 ZidekGOYqgkiAysGv4KXABBpUFUSBL9ZT5ZHKbRn77e2leuz/eShujAPSzY3W8KTBoWrFP 9/SJGnGu5i5REZx3KauouyzFdXcMRF8On/zk1BHNJ1gtqqFcr+VU7EeySQRoNDNtKNNrlA sdyLMo42Dhsx07A9TaXAHYLoY5a1+MW1S6jx4qTrse7VHZKQZxbL265OuxQ9OxOhON71Gx rWxpy5cuezCrzr11B+HGqVCWTisrQxsV2kXK3nzEpMDyh+BvR1anTyl5Zlx5IA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 8 May 2024 04:39:21 +0200 Message-ID: <20240508023923.28209-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/cbs_jpeg: Assert that cbs_jpeg_assemble_fragment() stays within the array X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lRhYOoaW/QKa Inspired by: CID1473561 Untrusted pointer write Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/cbs_jpeg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c index b1b58dcd65e..628841c5f37 100644 --- a/libavcodec/cbs_jpeg.c +++ b/libavcodec/cbs_jpeg.c @@ -401,6 +401,7 @@ static int cbs_jpeg_assemble_fragment(CodedBitstreamContext *ctx, } else { data[dp++] = unit->data[sp]; } + av_assert0(dp <= size - 2); } } }