From patchwork Fri Jul 5 00:21:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50346 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4000184vqv; Thu, 4 Jul 2024 17:22:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWB1IdztRpHAPALWaLQybf4MRbEKDVfHsjAKltYIZBKdE+yOy6ZPDnqE8gqok42iyDObVroCP5KgWth73QoFLyYBeVRGV+OevjJHA== X-Google-Smtp-Source: AGHT+IGvpsHu6jgzUKihEWwgESX1QG2h0mxymc0L7tIProBdxvWBm7KwpR7rjmfAHf22/yL6dt/U X-Received: by 2002:ac2:57c7:0:b0:52c:9e82:a971 with SMTP id 2adb3069b0e04-52ea061ae2dmr1885024e87.7.1720138948921; Thu, 04 Jul 2024 17:22:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720138948; cv=none; d=google.com; s=arc-20160816; b=UzoM5UeK1olhJJ+7CaQIWC5/9BtQtWGMDkjAho20BMc/th3B+dm4QBRscbb+naXSs5 KsPToJ+7buz4jO+kHRMJEwC8SILfmzMFWx6WVV2fRckFMMOrjME6QU0R6Pr1KXf0SNa9 sMmgmZt3+IlgJx3pZjPax2sQSqGO3sy86lihuSr2QMRsIBWx6AIjJ55P50GrBfQy095d n9YtlJfpDN0YZUylX8w5DS58eYCYclR5rKWjLC48KM/Tp7TwHaa1w5rBAYyFQ1aiIlK0 JAu6k+AOSsBxOSJnKTI/Y5KZ3jeKRQGal628HMIAF8k9jqziYFU3iJXcdIao+YrnCdlf Rd9g== 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=rp7ZSbNALQacs/3K084kAIIxptN49IGchsJF36C8AhE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=P4+S59MLzr5EFXshpFEUihsQxyLNzNHV2mFGotqo7vb/RUtaIiVqHZRtdnec/BzkPp 5QRvo0ePTRcx2ytXxvZq8xs4k5W176MvKBmYmqwLpB0rvDdrmePfasVNTZ4OI5DMOfTT 3DBqzojVsgBxdWT4KBC9A5USTw3Qta2Pgq/T1VgbCWj+HYV+BRZAetDljVOWWCXqCPhm C68T5VZU8UMFHf3s1zg/7WpVo8LlQC/JuX2QMLSTWH90EAHEoUEe6dGzkSDihOSvYhGM 27Jgchano6DsKw95m5SruUkKjSRV1u6BAFeKTVMWnCf7bCx6/qplfWgzqTTSvZwSd3Ek WlMw==; 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=aWz6zBfX; 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-a7515f92f1dsi577879366b.452.2024.07.04.17.22.28; Thu, 04 Jul 2024 17:22:28 -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=aWz6zBfX; 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 A908168DAD8; Fri, 5 Jul 2024 03:22:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C91AC68D9FF for ; Fri, 5 Jul 2024 03:21:59 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0B21920002 for ; Fri, 5 Jul 2024 00:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138919; 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=X9zEg64CZP4nGui7XB9yZzOrYNuyBTBnWKXtKr48f8k=; b=aWz6zBfXPEUXc+2qlF5YSkMg0oaManCamqhPKv2QyMh1LBjPi9Qe48hmYKZswkAbELGZEH 4YSRMPqcLlv5RZHEo2J684wvc8gFJU1Mj7ZYEQsxgOmKTUQT+vw16nXjEvnSTsmSJSdFsH XrDCr0i57azS/KMAczwu07s2g0oepRk4F2jV/g9JzIrbG9cpU1TpCOm6Ho4pNuEC1zNxcH BhEPjkN5ihj2wunXH0Rv9/eJeZ3QVLdwR5n7VAx7AbqQJl2mF1xWZg+bkMHwtbQp6aMiny OV+cSfgDj6+VhPXkn1StBhIM/Gwb+kDTEUX4mj2Hi/Xj8i1vGLfHuww6MPhT+w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:44 +0200 Message-ID: <20240705002156.1964272-3-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 03/15] avcodec/dxv: Fix type in get_opcodes() 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: ixe3Jxyl8cDr Found by code review related to CID1604386 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/dxv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 7c873a3e922..ba23222727f 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -240,7 +240,7 @@ static int get_opcodes(GetByteContext *gb, uint32_t *table, uint8_t *dst, int op size_in_bits = bytestream2_get_le32(gb); endoffset = ((size_in_bits + 7) >> 3) - 4; - if (endoffset <= 0 || bytestream2_get_bytes_left(gb) < endoffset) + if ((int)endoffset <= 0 || bytestream2_get_bytes_left(gb) < endoffset) return AVERROR_INVALIDDATA; offset = endoffset;