From patchwork Wed Mar 25 23:04:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18400 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9C3ED44B72E for ; Thu, 26 Mar 2020 01:10:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A37168B411; Thu, 26 Mar 2020 01:10:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51DDC68B034 for ; Thu, 26 Mar 2020 01:10:04 +0200 (EET) Received: by mail-pl1-f193.google.com with SMTP id b9so1395985pls.12 for ; Wed, 25 Mar 2020 16:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=17PR4mLtaNWa5ID00SKfoEIn/4yvVnUM5aHcoDfIADI=; b=Jaa73he5YYuw2iC7LsXf7rrrOvEyDtn+d55KVRZKNOfPqdTezAmhbRdhI7PutqAMko 2CJ/dhKtq0h9jt01VwdsCH2u25cdi9FC9Zefg/1T5vCAl3+jafNDiQ+GnsLosxlQhLvs mOr7O6p5RpXkFXqvVAtioD1CoeVwwE/O5uXYqe1SJbTNqQsv8EGqpv0fOsZ+4FyvJyL8 pUxQoWE5GTzWwD2SYj2c27cDEuiOk9EuSuQPZ1yPy9SbPncrF5QB1WVlCLULlsR264Jg 32a3dmHdZ6f6fKXPpZveUtfULlJXomRKKBqwapuBAVgYGmFUNb3aikbYX+EluQk5x0Tq FpyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=17PR4mLtaNWa5ID00SKfoEIn/4yvVnUM5aHcoDfIADI=; b=S4XfncMUUf3ujYU164nFWJPvi4ZyhckKv4MqJEvp58/M4XBIj5MQcGs6TdbVIJ8ALq ccLiSMVzi7lnC8chQeLrakOOXyf6WZO9+h8t/V/4KYauo+wfSkw+uSIBiqo/VmaB7c7V MmNNzChWOxsUDP2X9+HerEHqzOhaqnC3g7LhWaRQZiDIWGfRn224RLyIv6Y2cjxH0Thw s/QbzFwXmZ6w/LGMuQpdf9WIWSKKyV6RFfUgHhiv1tCFzT1DiD9OHAWDVWy3Fk446jGf qcm0yB53FzlkyAINL3TVIeoNNSkzgmub1rW4WRvRIkN78DTzNNvGwK7EiAjwzzHUvuz4 9Iqg== X-Gm-Message-State: ANhLgQ3Rct8Fa5g8RNsJoCx2jGwRIL1bOTgGphx3/gxqOfFnUoHkCciN 46w/xJAhLkEbFEz8iGMtRfz9qebF X-Google-Smtp-Source: ADFU+vurDfWj4EmL2ZZu3VA25xwDldY+zmXz0cF1sDvUR90G3bjljNzvIbffKVLcLPnkOglk0juFpQ== X-Received: by 2002:a17:902:ec01:: with SMTP id l1mr5362612pld.151.1585177469876; Wed, 25 Mar 2020 16:04:29 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u3sm250893pjv.32.2020.03.25.16.04.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2020 16:04:29 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 07:04:22 +0800 Message-Id: <20200325230424.2787-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/3] avfilter/af_acrossover: Check sscanf() return value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/af_acrossover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 20d1d2bda9..c9404b95cd 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -98,7 +98,8 @@ static av_cold int init(AVFilterContext *ctx) p = NULL; - av_sscanf(arg, "%f", &freq); + if (av_sscanf(arg, "%f", &freq) != 1) + return AVERROR(EINVAL); if (freq <= 0) { av_log(ctx, AV_LOG_ERROR, "Frequency %f must be positive number.\n", freq); return AVERROR(EINVAL); From patchwork Wed Mar 25 23:04:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18396 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3EC2644AB0F for ; Thu, 26 Mar 2020 01:04:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C27668ACB7; Thu, 26 Mar 2020 01:04:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6738168ABB4 for ; Thu, 26 Mar 2020 01:04:33 +0200 (EET) Received: by mail-pl1-f195.google.com with SMTP id h11so1391906plr.11 for ; Wed, 25 Mar 2020 16:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/k9PsYWXuC8su6Ek58SB5p2oXeCDNWqFXZqtHIEuAO8=; b=K4c80k9OsZ8ijzg8j3hvdz4fwoIkpacuyTe1/PRDYRcDyDHAwTZR0/DwLn1EnzdkWd XMZBvmP762MnfSRMc6Sko0kWAYWo0jTejECFgii4pb4og56LI7WgRb/dfqREJSZeGyxV Zm0thNounf60Wew40wQULwqK3oFmt6knQ33FoxLe9is0Lg3jOOqn2teoffYFPK6nMz2M NYtcDlvWLjngtk1OA6e/G94GytRe1tucOSafNV0rOlLoxiUMU+0T9LSGYeJ1Yg1hQ4nN M4Bg7ZVa83FTnoXxcQnd3O7Kv3KB6CJhPeoJj79k+pBGqW0eyFj4nnMx45Xz7VkBOR+M J4lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/k9PsYWXuC8su6Ek58SB5p2oXeCDNWqFXZqtHIEuAO8=; b=THzs2rRhsueHfk1BhcrZvhrtDirOwRn5aG3GlTF6N3jHxkh4HkvEVvxqtMXmU5KaUz cQ54GTTQq5JNJv8Mo7n6AI7r9zsuVR4QaJh3FA1MED1EsuNa5LYlh55JaKraMnDrHTwf B21QbdvTdwOqHX1y2175Nn4ccTXhX4y/okBZSNoTKeaqokAyN89Vqhw3E6EUhN6nJ7AT 6zE8fTNFKWuD4s9SkjsiiRwOkLDK4/7zfPf8HpsfFJcbJUgpkrC7bv0nSxxOJ6pyr0+L SKE9mGvcv4nkYtHjjg6eCQkz/XBBTW138A1mSaFSvwHfyzHekN3Gxk2Fa1Yh65b5X6oi j4zw== X-Gm-Message-State: ANhLgQ04CXxKssv/HcegnAxfMHusvkiMIDCmfqUgGb8novikKglUZjoi AMpqGlA6ONP797+Th4QeXH5/l9nV X-Google-Smtp-Source: ADFU+vtxEZY/qcoFlIQ1l+D5X1QYHJkOpjD48r8p+Ah9Urcd5aDaiW8DLob+T6dV/LezTugT2Ib/Fg== X-Received: by 2002:a17:902:242:: with SMTP id 60mr75513plc.245.1585177471327; Wed, 25 Mar 2020 16:04:31 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u3sm250893pjv.32.2020.03.25.16.04.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2020 16:04:30 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 07:04:23 +0800 Message-Id: <20200325230424.2787-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200325230424.2787-1-lance.lmwang@gmail.com> References: <20200325230424.2787-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/3] avfilter/vf_mix: Check sscanf() return value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_mix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 9e1ae79e00..e47f7e2301 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -108,7 +108,8 @@ static av_cold int init(AVFilterContext *ctx) break; p = NULL; - av_sscanf(arg, "%f", &s->weights[i]); + if (av_sscanf(arg, "%f", &s->weights[i]) != 1) + continue; s->wfactor += s->weights[i]; last = i; } From patchwork Wed Mar 25 23:04:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18397 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5807344AB0F for ; Thu, 26 Mar 2020 01:04:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 43B9F68B443; Thu, 26 Mar 2020 01:04:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7013689E39 for ; Thu, 26 Mar 2020 01:04:34 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id 7so1913878pgr.2 for ; Wed, 25 Mar 2020 16:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WwkStewwHcKxA2MIxrHwVccNjK61NTJeoPBc7exwEKw=; b=l8hlkUtdt3qEAM17LX800K1qiFDrijwzw7Vcr1+01KeVdDe1fBNuEUaYgUCvvzNDaR J44Zb5xjSmRERfHzXMnWaRUS2Bp6EoybN9SBMkHxN0KYAveTpGs8QqutCzVUcRzBQrVI 7yPjh1shSnvZ/Lnt/ytN+GNbBQ+d41kcx7rvHR/IJ9d0zVNXU/LJ9rFHqG0NZ0GR7ax7 BunJ3goRCFB3PIAzbOcXXFVfpi0m68bYkEW97OHvy1q2MGT6OkPCPGP2o075PZ6jvlK1 SuE5VPoAdzXvYAvqOqFkzW1/GC/BXAdP9WkW2dxORGh4blcGHHVvdLGpN6ZGpTQQbPnU FFPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WwkStewwHcKxA2MIxrHwVccNjK61NTJeoPBc7exwEKw=; b=ruNk1/Dvk34pIChMBIW6WLHaYXkzFYjTIayXwBVOD+D8HW9APSXiOAXJ4sCt6+7Kpg qI0/pK9M+IBa0RIp9DgQtW46bqn3ni2xNGzqB9zqTPb91K20ZmYP2fF9Rowbt70q0ku9 V1iAQ9ddtWRJpH0R8um3jYmkKe4evxUeW6Gh5ICUyvKwhunM74wTJ4w2diLurNk8cEap ddMRjmuMCWTyNVssvTx8D3f7AnWzQrlABwM2Tg8C4Bz85AFb2ZJL6yyZQGLDjxttxRZD WUgiqyRQUmSJ1eD3JbzrfgfO725BVdx5S9F0WkV74XbTH6OfP09UbJmzPrjtgFNVmUEX G+dw== X-Gm-Message-State: ANhLgQ3F9my+B/cpZZaHtxPyVYrhdTQIovyJTGCr2yO0HHy9mAQaqpPy kM8TbTIlHzGCOGF2L7CvKXvOLM3G X-Google-Smtp-Source: ADFU+vs/+AibV4jKhrHcuSHTTnlnXGX3cxaE+08O4LNS/H4eQnVbIZe3YVl0LsaNGhv6tgxFbSOJFg== X-Received: by 2002:a63:215a:: with SMTP id s26mr5435357pgm.339.1585177472730; Wed, 25 Mar 2020 16:04:32 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u3sm250893pjv.32.2020.03.25.16.04.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2020 16:04:32 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 07:04:24 +0800 Message-Id: <20200325230424.2787-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200325230424.2787-1-lance.lmwang@gmail.com> References: <20200325230424.2787-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 3/3] avfilter/af_adelay: Check sscanf() return value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/af_adelay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index c9647771f2..7f498ba190 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -155,7 +155,8 @@ static int config_input(AVFilterLink *inlink) ret = av_sscanf(arg, "%d%c", &d->delay, &type); if (ret != 2 || type != 'S') { div = type == 's' ? 1.0 : 1000.0; - av_sscanf(arg, "%f", &delay); + if (av_sscanf(arg, "%f", &delay) != 1) + return AVERROR(EINVAL); d->delay = delay * inlink->sample_rate / div; }