From patchwork Mon Dec 12 00:31:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1759 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1413081vsa; Sun, 11 Dec 2016 16:31:59 -0800 (PST) X-Received: by 10.28.41.5 with SMTP id p5mr16725769wmp.38.1481502719874; Sun, 11 Dec 2016 16:31:59 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g8si42395636wje.166.2016.12.11.16.31.59; Sun, 11 Dec 2016 16:31:59 -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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1A01689DF9; Mon, 12 Dec 2016 02:31:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF36C689CF2 for ; Mon, 12 Dec 2016 02:31:45 +0200 (EET) Received: by mail-wm0-f53.google.com with SMTP id t79so44077395wmt.0 for ; Sun, 11 Dec 2016 16:31:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=DHDGW3eHWZKvjRsd/+HqieKoL7wkLq0PTF4mFsh8zLI=; b=lcFQdhW8h946rHdd8h6y2DCLJMRhC4UpihVriuEifB38pB/uArJuuh84sCM7EDHzhn otUBjYpLUJm3acBaVnspzrC06lsZ2twaEdCEBlShOSnXaCvd9jEBInNbPbHmxNGSQctf UqYFHpm0bDTGI1XK4KX/GN3vwvEd1rN9XszTPuujwceacyHYpDnzaGYd1krDXaHH9jCl 9sCh9m/8dxI7TOqI8nXPdaaQMLsKc0q7/jzEKaSp5/IIbzvGgMR4EpQ+jLb/POadIHvS 7LrjcOlgYK5Ecc6MaZr9SLYenJ41gp8r/3s8I1ZNeJar1Db6n4GxHx7ItPqwTqQKFsGT mU2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=DHDGW3eHWZKvjRsd/+HqieKoL7wkLq0PTF4mFsh8zLI=; b=QqzxCup/aEzpzECheEgFxV3ocAuggbfyzoKzg1O8E8zkR4d/xeonv8VHctRiP3Sk2P z9IUwMYUdEm29PeBAZmqYSGJ22Gt2kxdzwjUpc9XcJTuP/DaWeZcCqWseZxSn2pr3li4 RzO/7jnKZEvOoXGwNvSqzO5Jhk4gvl5zy6fsGEXUk5SL7D+LzUHCvyTZfmsaB1nrLwrF PK0yne5B59H6z3MFBtuaPf7uXVdjsb0SOC5AiVsyuT5VZk7PmHon8Zw3dm/9dI49kgB4 eRWuCYJENofP34KR4JrXqH36tfTK6guF1xge5krw9uUq8TEvauImsnQqd1YpE0iTmnD1 Zymw== X-Gm-Message-State: AKaTC00/Ne99iW4HE4XoHgoCJ3NsDU428mOuqVh+UT01PhnMX+/MWDAjPJvsH+DYglQlPA== X-Received: by 10.28.13.9 with SMTP id 9mr14396458wmn.50.1481502709643; Sun, 11 Dec 2016 16:31:49 -0800 (PST) Received: from [192.168.2.21] (p5B09532E.dip0.t-ipconnect.de. [91.9.83.46]) by smtp.googlemail.com with ESMTPSA id l74sm32792242wmg.2.2016.12.11.16.31.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Dec 2016 16:31:48 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <907a7206-4b4f-171d-39c3-03a5e19964ac@googlemail.com> Date: Mon, 12 Dec 2016 01:31:47 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] opt: reject denominator zero as out of range 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Cadhalpun --- libavutil/opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index f855ccb..6ae2af6 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -97,7 +97,7 @@ static int read_number(const AVOption *o, const void *dst, double *num, int *den static int write_number(void *obj, const AVOption *o, void *dst, double num, int den, int64_t intnum) { if (o->type != AV_OPT_TYPE_FLAGS && - (o->max * den < num * intnum || o->min * den > num * intnum)) { + (!den || o->max * den < num * intnum || o->min * den > num * intnum)) { num = den ? num * intnum / den : (num * intnum ? INFINITY : NAN); av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n", num, o->name, o->min, o->max);