From patchwork Fri Jul 5 00:21:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50350 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4006709vqv; Thu, 4 Jul 2024 17:44:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8+ladmQUrUQ7NWdruOdOwUcLI6rCRzr5toITMDFMRRtrZl5Nd1+FSU1vdMfUBZc7X4ou7tKynLJpmjZJoyURrvYSNU2bluBjqLw== X-Google-Smtp-Source: AGHT+IFNQ3NTXRbRBH/LRqfkU6NXstwWaVVGISjUYPVJRUuUtkrFS7VYAj7OOeIVBN+utdaWhymA X-Received: by 2002:a19:4309:0:b0:52c:d5ac:d42 with SMTP id 2adb3069b0e04-52ea060d2d3mr2526429e87.9.1720140246953; Thu, 04 Jul 2024 17:44:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720140246; cv=none; d=google.com; s=arc-20160816; b=GEhQ6DKfI/4XHegf5pjTIF8PwNkRSOTBBC+hL79gBpluDVOdyxohgjgxz7zqMkRrJB ewgA+Rf3oAOVpWWptyYytSH/g45KtKiaKnI9ngXDoEfz9iXWARTu/Jhj76l2MsgVg8c5 1nzI3TOMaZAYkwV6V1KZ3wHp5kvaHZ3wwpY85tc7TDuoyDhY0fwA/8KuNV+2qIqEB5PU SUpVbXedQELa+jq/uRmAokkreWmhfJXclES34c45nwbxdmBe+FW8uGfPfdnLzkAsTf8J IZHmBkgFTQ5fd9iuYaAjWZWG78Jt3ZdXGfuLY/fBGEz1Pxr8cDbOSMYSTWNUMMZxD8P6 XVbg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=PWb21M8+NROrAGJlSy7HOfLkromc1BBVFv+MoMhln4w=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=mmISRgYuxCxc6FTl6CmRCJ4kXwMOL3qWzHruo6Ob4a6FWrgPCp9aXec1fF5uul5EgG 9V3pNKNVVBMWYrOS/9RwrxwnhEiZ9qx9958m4xDnGVX+wL6v3JgQquBuDz9z2AdX4SD/ MrOPipT0oYFTmIBNSB9g4kNDQJbE11qEKcAiSscnWUnPluOUukRzC+7d+ioejU6tSDmL vmP+md8lj7OoLVnbgEVcEKMsDau+Uke+GNeQ5zgvsaAexNzTA99RKzkS6hGh58EM5Q5A Z/Z72fRK9/r5rWXzk9ooCCyJx9ebWavcWxexuDvaYrq7ZT1nsJvs2T50mSoAhwYJ3ePt c/qQ==; 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=lAMPI1Td; 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 a640c23a62f3a-a77c343cac3si75789166b.788.2024.07.04.17.44.06; Thu, 04 Jul 2024 17:44:06 -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=lAMPI1Td; 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 9F31068DB10; Fri, 5 Jul 2024 03:22:26 +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 25AA068DAD6 for ; Fri, 5 Jul 2024 03:22:03 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6B52A1C0003 for ; Fri, 5 Jul 2024 00:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138922; 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: in-reply-to:in-reply-to:references:references; bh=NUSUn3xL6Q7FO+1EuyXIqkd5UO3/pBbtPrnazgB73Pg=; b=lAMPI1TdAe/UNgsIvYGuFcP45IeBorg06zRmMeEqt5iDyFfV2yBY/5yc4ZNZYyrPWZpWvi 4Igv47tQM1lsTzmfsKUZgpDRsZXYzSpsdodjJG/rWcLt29nl3gxw47nfPjN1ReIEt/ek90 FisOhxqmeSwakP6pBqiM0OEVlq+SFVJOVodPEcYbU1BvXka2p3ZxfWLmOMNt2B6OEZAIuc Kcy2xg+8yDvMdCpqz2dE2LxTetz7Xvk9dLf2moyArThP+5HH+FswkkZ9to6jfVMu6AjGKJ axuaOBcozEET8xuXkvDiZ7y62DgGVF/4vBo3FzLaJTygS4//Dks1YaSeiVNNmA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:48 +0200 Message-ID: <20240705002156.1964272-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240705002156.1964272-1-michael@niedermayer.cc> References: <20240705002156.1964272-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 07/15] avcodec/iff: Use signed count 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: lX8zqZpi/0Vj This is more a style fix than a bugfix (CID1604392 Overflowed constant) Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/iff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 4b3e8e0c21e..13010b451ef 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -523,7 +523,7 @@ static int decode_byterun2(uint8_t *dst, int height, int line_size, GetByteContext *gb) { GetByteContext cmds; - unsigned count; + int count; int i, y_pos = 0, x_pos = 0; if (bytestream2_get_be32(gb) != MKBETAG('V', 'D', 'A', 'T')) @@ -531,7 +531,7 @@ static int decode_byterun2(uint8_t *dst, int height, int line_size, bytestream2_skip(gb, 4); count = bytestream2_get_be16(gb) - 2; - if (bytestream2_get_bytes_left(gb) < count) + if (count < 0 || bytestream2_get_bytes_left(gb) < count) return 0; bytestream2_init(&cmds, gb->buffer, count);