From patchwork Sun Sep 30 20:45:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 10527 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp937188uaq; Sun, 30 Sep 2018 13:45:45 -0700 (PDT) X-Google-Smtp-Source: ACcGV63H1MsQgXOh3MWQIJxX5XAnjT2gsce2d+CEGNmJhwgb3KmER15OB4SXT/PM13z/6IwKewxz X-Received: by 2002:a5d:4684:: with SMTP id u4-v6mr5151747wrq.76.1538340344941; Sun, 30 Sep 2018 13:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538340344; cv=none; d=google.com; s=arc-20160816; b=kD7VMlgxO5OKzcNFHvHgwD8h0j6/r4oAciAgQ9M+ngrlJ6dVMYboNlv/PFUvjUlel6 trONDkPY/TkTEAZ+EFoarlQr/0ARgrghvTpgWNi4KJHW+dZcYIJlrsTpfMfsFh759N5Q ohwMXhdGKS6wD9sMwYItbqwqMQD3nCwMX0Ib6B0lJHc9LWzQTRqhbgNHcaEc719Oqk7g eAMzc9qg4gJFS4/31QZS458premvFmOw/o7C0hfLtGt0AtNpt2XYs2hU0ulR38T2ispw nOmUJg7UySHMSlHorUTZ4OOKfD0CpJU4r0fIazOwsb/zgSGQXYzWFRje0YQeU4nBxDXv kTmw== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=1sL4gmi5eUEHRs+L34g1T63aFTp/VR4B/PwG6vAdEeM=; b=x9TWthDOEIxz4Wm/KpOjvxclJWK/DePV30nTtUi6VHCwXHLOcE0MMwTAr/Fv0rIjUD Tn8R6XInLRDJb/KmipHnOx78w9JVfaM2Pb5WvIBdmVV55Y561I9EfhBoQ6I6Y1jUY/Ib OVfohUSCCDcOG8Rw+hs+7aGplgqyaPVkktg+uCyDfWX1d9H5zWSE64GA5Q7dydPCub2D Juk6hIy2LXKbDk3WWGrCgZb3fXKmG4qg84XU7KmWgmpQcLxIXsUzF5kl1VZFe+lRIHnx lx59Fk7yZjdi7POIsiN41WR8WsmFOz8cvWRvgbbr8NfOqQ92dZOyR824kiSajOoS+KWE vAeg== 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 n10-v6si8165316wra.324.2018.09.30.13.45.44; Sun, 30 Sep 2018 13:45:44 -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; 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 9C53B689E1C; Sun, 30 Sep 2018 23:45:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15AB9689C47 for ; Sun, 30 Sep 2018 23:45:05 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 87612E1471; Sun, 30 Sep 2018 22:45:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wl13tAsE7zjw; Sun, 30 Sep 2018 22:45:22 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 8557CE1470; Sun, 30 Sep 2018 22:45:22 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Sep 2018 22:45:11 +0200 Message-Id: <20180930204513.26772-3-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180930204513.26772-1-cus@passwd.hu> References: <20180930204513.26772-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 3/5] avutil/opt: check for minimum and maximum values when setting AV_OPT_TYPE_DURATION fields 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavutil/opt.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 99282605f5..93d6c26c11 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -496,15 +496,22 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) case AV_OPT_TYPE_SAMPLE_FMT: return set_string_sample_fmt(obj, o, val, dst); case AV_OPT_TYPE_DURATION: - if (!val) { - *(int64_t *)dst = 0; + { + int64_t usecs = 0; + if (val) { + if ((ret = av_parse_time(&usecs, val, 1)) < 0) { + av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as duration\n", val); + return ret; + } + } + if (usecs < o->min || usecs > o->max) { + av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n", + usecs / 1000000.0, o->name, o->min / 1000000.0, o->max / 1000000.0); + return AVERROR(ERANGE); + } + *(int64_t *)dst = usecs; return 0; - } else { - if ((ret = av_parse_time(dst, val, 1)) < 0) - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as duration\n", val); - return ret; } - break; case AV_OPT_TYPE_COLOR: return set_string_color(obj, o, val, dst); case AV_OPT_TYPE_CHANNEL_LAYOUT: