From patchwork Wed Mar 20 02:19:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47249 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8ba5:b0:1a3:31a3:7958 with SMTP id m37csp122700pzh; Tue, 19 Mar 2024 19:19:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXyYUIeGrui9eBRoQ2OmIOUGlKIW0HkjdclZNxj+c4HxTs0KYGWE5imWtvQOckDfu5k09DjuDMl6H3fxpiObAMxQh+kYVGTYZUGMQ== X-Google-Smtp-Source: AGHT+IEQe0+uZKLNkkt4lIS5kWP9UrFbW1FpxCvX2zGSkICPq1jLHKKirvR2MyZtZ1c1woAbJ9RQ X-Received: by 2002:a05:6402:401c:b0:56b:a6ea:8fe1 with SMTP id d28-20020a056402401c00b0056ba6ea8fe1mr1498488eda.2.1710901178839; Tue, 19 Mar 2024 19:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710901178; cv=none; d=google.com; s=arc-20160816; b=XH77eGjOltJOsqpHMC6HMETfTfBz5xXWZVASCKhAsEKUPXCp/9BS5MvnrrnXgHfKo3 lnQzLiGdCR5rgfbzcBtXEdVvoh194WLuZVskvPCR+cABL8NIX5pI97rABNwOHA+3cLF1 w1qF/ZoWHizredYrnABeIucB6EVhk9TZ3+4ITPbhUrhQOWj/CR4d8HM5S7HWVYzD1c4H L9PyH+OxwUqzTcINiNS7WjTOLkH2mYncglmnRXHzeGtGjoqkG3PNqKMs6bcI/PWywmUO tc14VHzJ53C2uM9RdZwkApfYV2uPgYgKDtWlrNomqmBwKk/OEZ/In+Cqx17SmVVrLgQs J/6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=JjYC9eDa0DEf//yGRLjEHHv4yc04DQYk5yvA6Z41Uyw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=sSxtLKSGWPoaTmePHy1AqLTEtdZhe7tR5pMjJNBM5xeoslT1vFaKi2b9JU1I2Z+VLO 3pr/CgvDctRN5xoUdI1GkmUrivkpi9nIEsaMK35xgQrGyyTmIdThJJJC41J1yUPgfrIe PmH5V2j8f0bMqyaQbeO1lS1/XgC76Apwj/zLb2LY7UDtaJCIik8lgvUaqbhE8heJ+fr8 WhVjpSiptw2Ly7SHMfimC0Lz3GVdTTcHEHrZ4YouuIzxu4Pkp09oMzSAbsPeedjcxwjV vT1b1Xzo3YzM+EN4d5DVXxGOLLTLC33LHbsCwOtsGmV2HxemWIj652zTXYlZAJUQ+7zt NYbg==; 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=RszTvJOq; 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 c14-20020a05640227ce00b005694e013fa2si2818942ede.636.2024.03.19.19.19.38; Tue, 19 Mar 2024 19:19:38 -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=RszTvJOq; 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 F25F168D4AC; Wed, 20 Mar 2024 04:19:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B36F68D3FC for ; Wed, 20 Mar 2024 04:19:28 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 77AFEC0002 for ; Wed, 20 Mar 2024 02:19:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1710901167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=/JNjTuv8UojxD7T+0BaPedSp75z8n0mNpnPJU6E6Pls=; b=RszTvJOqlC3nh2eDCUqPwD8B4Q3uPuj1LWtJGge3iDCx3UWRbrI6fY7sNkWyryGxQzLIqv F8ajrgU6NRBpFI8IPNRSauvTTt42AMdQYK0EnywFUMS9XR3LCgO9AODCVAn57JCigff2J8 Rxjjdtj3soTc4jaFlqWI0dWtfA7pY1Vsvz6hFMjwZU3HpmeNithiiCHKG3zDal8FPAMwul 6gKSbtcI0q1qyHPp26H92eBXVQZNTjAjGFtA9QqpM1numCTGX6LeNypUnJWsDiR06Clw8p BOLrXRBQsCocFp+sLK/DRzCGJsUW2DpLLQrhq4RG6ljjUl5yQJUOQ70IA0dwww== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 20 Mar 2024 03:19:24 +0100 Message-Id: <20240320021926.3759-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avformat/wady: Check >0 samplerate and channels 1 || 2. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RhCX7MdLgF1k The WADY decoder only supports mono and stereo This fixes a probetest failure Signed-off-by: Michael Niedermayer --- libavformat/wady.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/wady.c b/libavformat/wady.c index 6dcc0018f3..81a64c6d3f 100644 --- a/libavformat/wady.c +++ b/libavformat/wady.c @@ -32,7 +32,8 @@ static int wady_probe(const AVProbeData *p) return 0; if (p->buf[4] != 0 || p->buf[5] == 0 || AV_RL16(p->buf+6) == 0 || - AV_RL32(p->buf+8) == 0) + AV_RL16(p->buf+6) > 2 || + (int32_t)AV_RL32(p->buf+8) <= 0) return 0; return AVPROBE_SCORE_MAX / 3 * 2;