From patchwork Sat Sep 14 10:45:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51599 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9fc3:0:b0:48e:c0f8:d0de with SMTP id k3csp322937vqy; Sat, 14 Sep 2024 05:09:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUy3C/iiXxnR/8GpU3xSRHcLdrgBr9TAbnEbK+7LcmnWl+TRVCxOZ9oEnLwfFEp40Dl2H+bENDzOQ9R9HZbllev@gmail.com X-Google-Smtp-Source: AGHT+IF7oRxiBIoWOAsbXEfOwkaKVKm7P7kjlzVofAjfxHBM7GudxhRdJ47+TSz84JMQZfYa+Z58 X-Received: by 2002:a17:906:c149:b0:a8d:2623:dd16 with SMTP id a640c23a62f3a-a90296133admr426630866b.11.1726315754833; Sat, 14 Sep 2024 05:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726315754; cv=none; d=google.com; s=arc-20240605; b=Gn44u8D/I5fN1jjKoJJA0W7NCcfftrGKQ/og8Nr9Ouk914Q2itX0OUV05NGQu/fHIp lYV/vDQXFudm3rSAE3Qf/pdwrHFOIpvoHn4YmxNRDS9uN+u5NEdQOqCr1iN6Vwt48paJ jrDuk6IfTDq1XBech/mOaWUhez9NCHo00YDNJwkCRH4i7PzwIh699kxqbuFufxPEKfwH ZZud7ht9R/3dGPAspZfOa66XxA2XT+RQES6gdS/kPOpiE2eWrzkrcmC/TzXDayNNSxvW lrWoN9nVlTFbrqG3Hw7AiXcOXRkUiIWkcKsUjeOnXJCHJ2992zA1sKV5r4DmtYzgsnjA 8Omg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=+Xh34iKrKiQ1Cv4wh2uh6kn+lITKO9lnswK5qSvCoEY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Vr40C6yzj1mD3WVXXgHrgIhRaXL4yAI8H2o2H78g/J4HetnZ2ePN4cDuRj9e3QZgaG iGngAHavkNWxT41PIq89sXY6yxEwUGxutqbmPX5Uv+JAhj6LwwaESp8mYcxDSHDnQp4W 8Ad2wkjS+tHyUiiORuOUsO+D7Cg9FAcOZ96G4zpzH302rTC1jGaPD9Oi4tBpIK39utJm 61XK2O271dydBfTNz4dZTwWjxvIJAqyqg4OpoEOC+jBCouERD9MBHp3QDNZh3+xHfjs3 eu6VCdbZSDiCVg50shLKtk1SPPfh5L62Slg0jsqIiHsCdUsdBuEdxl85n/6VGKkZDVYR gxtQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=daPQ0Zed; 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-a906137231csi91884566b.961.2024.09.14.05.09.13; Sat, 14 Sep 2024 05:09:14 -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=@khirnov.net header.s=mail header.b=daPQ0Zed; 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 C3DB068DE79; Sat, 14 Sep 2024 14:11:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C4C568DC9E for ; Sat, 14 Sep 2024 14:10:54 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=daPQ0Zed; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 6485B4E0C for ; Sat, 14 Sep 2024 13:10:50 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 34FORLpWKcV4 for ; Sat, 14 Sep 2024 13:10:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1726312246; bh=TLPaARIyRXIpXcjGi4L3enqHGpQHRcE7O7FnKRmDcWY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=daPQ0Zed7WwVDyCjzBTVPDe10CQtx7MDd1j/+oxkVC5vLGtrAhaJNbjjI9w6mQSt/ OlwN9Y366eHY5YkkHdf1prYZIiwFPr1AoCth40+WHN5KMIc10i3FYKpID7G3pYbtq6 3OyxcNQsq4gYCv9Czk94z+nfK1I79sXQR4k+cIbKUn0KpL+eyFGUOQwt2q6qiSPk1o aq0hwLXQj3cUXtQnQNBdIhLyVXkfiFUn7NxOjPWqMuX8yW/FqUau/fFuKJCSjALd23 7KNREmtItDp5TPh7Ap4eJOyYqGJGXy23+HlkOQTDjOaISEDLiD9niBMdUH0h4PAQ8y 0BZ/T5RJTnCHA== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 8C87C4E1E for ; Sat, 14 Sep 2024 13:10:46 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A0D323A20DC for ; Sat, 14 Sep 2024 13:10:41 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Sep 2024 12:45:42 +0200 Message-ID: <20240914111036.17164-18-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240914111036.17164-1-anton@khirnov.net> References: <20240914111036.17164-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/23] fftools/cmdutils: tighten condition for media type stream specifiers 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: n8UYniDfEDht Require the character indicating media type to be followed by a non-alphanumeric character (or end of string). Needed by future syntax extensions. --- fftools/cmdutils.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index a9a7ff4194..1573106d8b 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -988,6 +988,12 @@ FILE *get_preset_file(char *filename, size_t filename_size, return f; } +static int cmdutils_isalnum(char c) +{ + return (c >= '0' && c <= '9') || + (c >= 'A' && c <= 'Z') || + (c >= 'a' && c <= 'z'); +} void stream_specifier_uninit(StreamSpecifier *ss) { @@ -1024,8 +1030,9 @@ int stream_specifier_parse(StreamSpecifier *ss, const char *spec, // this terminates the specifier break; - } else if (*spec == 'v' || *spec == 'a' || *spec == 's' || *spec == 'd' || - *spec == 't' || *spec == 'V') { /* opt:[vasdtV] */ + } else if ((*spec == 'v' || *spec == 'a' || *spec == 's' || + *spec == 'd' || *spec == 't' || *spec == 'V') && + !cmdutils_isalnum(*(spec + 1))) { /* opt:[vasdtV] */ if (ss->media_type != AVMEDIA_TYPE_UNKNOWN) { av_log(logctx, AV_LOG_ERROR, "Stream type specified multiple times\n"); ret = AVERROR(EINVAL);