From patchwork Fri Dec 1 09:08:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 44851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a301:b0:181:818d:5e7f with SMTP id x1csp945444pzk; Fri, 1 Dec 2023 01:08:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVX2OmNp7vo5sZOVpdQ3pJFqp5NGunWketKOiL3MxxPw/c1XAvJSfzK5hFOiIdLt5i5h8p X-Received: by 2002:a50:8e43:0:b0:54c:4837:9046 with SMTP id 3-20020a508e43000000b0054c48379046mr549118edx.62.1701421734719; Fri, 01 Dec 2023 01:08:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701421734; cv=none; d=google.com; s=arc-20160816; b=xSETUbtn6eXgiRsI/aYma1iYCnP0epjxAJ4jKXYfKim9j11cldurf7KpIk1g/+sgtl ZVy8Ie+mzsK0YgwWf1boeZQFTIpUKGEHpYAr/1tJdG052b2YdlYOAHggar8+Kg9LMJ11 8f3riCfr+mLciBkKVx4+p3vERQfBStTcSfPXZhqN7O4T+e/JFrzyJUWuvGzLWfM8zJNV LgbisJ7XqGcJPFDTOArwawbngJ6Q7jRhydScJc9EFnqHEUMCbGLCaCY4Hxq54DSzgvU0 ekysKlUh7tTSEgZSgaBHzavXaODMSw5B+4Ynqs4pneaxWWv4dxu9KJZ8OMGB2XjHNfzq ZgWg== 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 :delivered-to; bh=zbLiZUvoDN32Eoi/jW1M0IKwBFamoerCG3Km8TBmUIE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=IF8vacwXAXk5sxaGI5PGZFAfwuhpcwxud9fH9VQ0t2sQ/OjZ0ha6IuTQepVMCARI+P trX+91dR3jAx5Ua1Vv3VVLfRmxFcxnKMEo25Ag0CGeKatpPFql+xgHIXnsUMvNgoy+2n QnGL+S4/0ThS6+Me9u6umipl1gXcKdTQtzlvvoj53Y/jFpx70nGno59wxHchgHNV2Gzz ab1EZEGsQCMt25QQ15P8CvAOQwUhnuF3VPwinMy/Kb969xAEQrJmwzG4wVd8pjX+rhQn e0O60sqPIXQHidc0y7sF2h2FPes+7NT/tX5ax52dYia62Q+V3TV7/5tfSOHgqUKuMFpn j4gg== ARC-Authentication-Results: i=1; mx.google.com; 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 u25-20020a50a419000000b0054c4daeac99si553371edb.54.2023.12.01.01.08.53; Fri, 01 Dec 2023 01:08:54 -0800 (PST) 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; 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 A994C68CFB7; Fri, 1 Dec 2023 11:08:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9F2468CA21 for ; Fri, 1 Dec 2023 11:08:42 +0200 (EET) X-ENS-nef-client: 129.199.129.80 ( name = phare.normalesup.org ) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef.ens.fr (8.14.4/1.01.28121999) with ESMTP id 3B198gss009786 for ; Fri, 1 Dec 2023 10:08:42 +0100 Received: by phare.normalesup.org (Postfix, from userid 1001) id 00E10EB5BB; Fri, 1 Dec 2023 10:08:41 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Dec 2023 10:08:33 +0100 Message-ID: <20231201090839.3838325-1-george@nsup.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef.ens.fr [129.199.96.32]); Fri, 01 Dec 2023 10:08:42 +0100 (CET) Subject: [FFmpeg-devel] [PATCH] lavfi/af_pan: fix sscanf return value check 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: nOnh6/qsZRBM sscanf() can return -1 when it reach the end of the string. Fix track ticket #10677. Signed-off-by: Nicolas George --- libavfilter/af_pan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index cfed9f146a..9ab827b396 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -69,7 +69,7 @@ static int parse_channel_name(char **arg, int *rchannel, int *rnamed) skip_spaces(arg); /* try to parse a channel name, e.g. "FL" */ - if (sscanf(*arg, "%7[A-Z]%n", buf, &len)) { + if (sscanf(*arg, "%7[A-Z]%n", buf, &len) >= 1) { channel_id = av_channel_from_string(buf); if (channel_id < 0) return channel_id; @@ -80,7 +80,7 @@ static int parse_channel_name(char **arg, int *rchannel, int *rnamed) return 0; } /* try to parse a channel number, e.g. "c2" */ - if (sscanf(*arg, "c%d%n", &channel_id, &len) && + if (sscanf(*arg, "c%d%n", &channel_id, &len) >= 1 && channel_id >= 0 && channel_id < MAX_CHANNELS) { *rchannel = channel_id; *rnamed = 0; @@ -165,7 +165,7 @@ static av_cold int init(AVFilterContext *ctx) sign = 1; while (1) { gain = 1; - if (sscanf(arg, "%lf%n *%n", &gain, &len, &len)) + if (sscanf(arg, "%lf%n *%n", &gain, &len, &len) >= 1) arg += len; if (parse_channel_name(&arg, &in_ch_id, &named)){ av_log(ctx, AV_LOG_ERROR,