From patchwork Sat May 25 11:18:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49249 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2255293vqf; Sat, 25 May 2024 04:18:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWw2bHMk1CMlNKybnoqzr8brNKg6PBE36GNA/4uR/BYUBpyKay9O1yl3Pr6VS0+4h1miRwZ2Lm2XDdOSBWVzq5rpe0x4iliD5QWDw== X-Google-Smtp-Source: AGHT+IFV+w2+jeXEIT4apze3Gy8FGxn5j9sEo75YxmIs1h1ZIWC9qU+Qd1y8Pkrz5lITlFLtqYD8 X-Received: by 2002:a17:906:c302:b0:a62:b679:3e7b with SMTP id a640c23a62f3a-a62b6796284mr58724666b.61.1716635917629; Sat, 25 May 2024 04:18:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716635917; cv=none; d=google.com; s=arc-20160816; b=wiz75OiKYQF/ZmMNb7GnfG35JzMb/q3CQavAb2e635LxpasGCt8P6GhiSTKy9vjjGb MnI/4RVno3ev0/ysmG/yoW4f9luxcqyZ2UUwU7/rVU0EIYvh2ErsnBrXlRReypkH9xN/ R0r8yWNclAY8VO+YVGT0ZE71Ga+AYKXjQDjjinPyoWVRjrE9Ugk5JxoCc8M0w4OCsfUQ SxrGIx79Rq3AtgPAQwcjOyyBqpf4G5jcJN5Hf6+5taxigCBI3fmcRPi4GFrpGkaKJH4o 2sQtHXTsZwOZ5i9X+FtOMk1A7w5YVVuLqlfd552kiEXNJcOugKGjtrxfBrIzyMOBLaGx 3WRg== 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=T9gDcRC076Rbkcq9qs7jj+TeXcuXjCzxUOggiUHQ7vI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=NfltlPY9k8c84gCdQGhNr54ea4pLUz8M1Msmo/UPN5ICC3zCBIhfog4ta/C8R56QFj Ao56s5KztUR+zZgKg19+s5MNhvhhGZZ6RaOw3rPr0TBCoqXDVA39CkJ7dkyQ1cDJqgn5 w5nYWnrPeOfVAEcYkzki+m0wzzHDL4LWffYhlMJEF785CRZ6sm3/FbikmOf4NrlLAgoH NUHEZKV+eKkQ0kiPF8SPsovIuXFvbAXvi3zb8xE5HRbV52oPOrzWYb1kceex/NeXm+E7 o1gzhnnj4pM8y0IN4698qTQJVHcnh9qPWMeMivjcmJoD2a5ig6H2nZnCxOAgwzlrZ7VZ Jrow==; 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="gzWYsUd/"; 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-a626cdd5566si174205666b.1030.2024.05.25.04.18.35; Sat, 25 May 2024 04:18:37 -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="gzWYsUd/"; 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 8E17D68D545; Sat, 25 May 2024 14:18:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B877D68CF47 for ; Sat, 25 May 2024 14:18:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E89AD1BF204 for ; Sat, 25 May 2024 11:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716635896; 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=P+s/sQL4sCEtc1AlCehOR+3/301kpAo2iUSEthwB4oI=; b=gzWYsUd/mEzRdChjcMGx+o8N/NYNprDYKR6HFfEFy7DHOeyRbgFsPdAkdEugwk2/qoAg8O Rze2yVdoiv75moH/gK689BENl6c21Eub/epatws0XcDV347TVn4BNAp0iV5Y1P25+WVAUZ a+Glj8nZvWGetrfC5Z2vbMEMVJ0JhBJTfwct/ehL0hz81aHjMB3FjTDt3nQ7HUF+CZ7iBm XVok2bRGLtu4DNB3Vty7XP1hcmFF+Wmqd0EEVNBbPVuCjonoYjN1xHZGbchQpbeG6pVZvd DJOS6N+aRE3UT+EcMPqZVjykbvPquA39G8HWGQBSMPtW0YkJAWHzgwaG9j5ucw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 25 May 2024 13:18:13 +0200 Message-ID: <20240525111814.2587729-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240525111814.2587729-1-michael@niedermayer.cc> References: <20240525111814.2587729-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avformat/fwse: Remove always false expression 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: s7CkB1r14Rcg Fixes: CID1460758 Operands don't affect result Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/fwse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/fwse.c b/libavformat/fwse.c index 6c1103da146..dc4750d946a 100644 --- a/libavformat/fwse.c +++ b/libavformat/fwse.c @@ -67,7 +67,7 @@ static int fwse_read_header(AVFormatContext *s) av_channel_layout_default(&par->ch_layout, channels); st->duration = avio_rl32(pb); par->sample_rate = avio_rl32(pb); - if (par->sample_rate <= 0 || par->sample_rate > INT_MAX) + if (par->sample_rate <= 0) return AVERROR_INVALIDDATA; par->block_align = 1;