From patchwork Sat Dec 10 15:11:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1742 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp867897vsa; Sat, 10 Dec 2016 07:11:29 -0800 (PST) X-Received: by 10.28.189.69 with SMTP id n66mr2599445wmf.35.1481382689155; Sat, 10 Dec 2016 07:11:29 -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 bo9si38051150wjb.202.2016.12.10.07.11.28; Sat, 10 Dec 2016 07:11:29 -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 546F3689FD8; Sat, 10 Dec 2016 17:11:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AE80689EA7 for ; Sat, 10 Dec 2016 17:11:14 +0200 (EET) Received: by mail-wm0-f49.google.com with SMTP id t79so12735947wmt.0 for ; Sat, 10 Dec 2016 07:11:18 -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=mDiQEjH1mK82FPztajgqi7dgllwPcKtpF4PDRFrDOPU=; b=PiNgBInCq1ds0PVUBMXE1TVeZAsork4i6h8i3idSg4mF9m5AWa+2+rpkt7dDUBIrOJ qICREdddD0z0l4LfGEA4ZTN+ZrcRA/M41YxjCXfgUDEA5yw4IXOCFo50QAKQhpSCnnMn +DHVKtkt1Ik3zv0EvzWzvPNyz8xnuyE+iQ5T7Nvm/Ej+EipfCfpJsSkZTNybJVFKj+sZ baGJw9ClaOQe7t4rJkV8laRUXaCDJ501KcHoKt7Rcz3fRrS/DTsaATApUUOJ4+UYr/yc pU/uHoJZPK9/h4Dm8RYKn/RqtFUp5xiBSTbvg/U4mlqh2ytgfC/Bn37nihX3aBDnadPl 447Q== 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=mDiQEjH1mK82FPztajgqi7dgllwPcKtpF4PDRFrDOPU=; b=S+FJ+3/d2e/9+xoY6qIvqHKccYsMAXn+BZ9hW+HpelHDihtm7YjLUKmrH+Z8+0NVl+ ggN/z9PisC6C8p9UuNvxGuAQeC1MyaOzEF0n2Xk8+iCm9yA2LjuEQVHLNzfYW0tETCvD 50SpvsojN2zJ12dwvcixHhjwsHZwL/pqykyKoxelcjOY5ja0U7R8B2iHIEsj9zmprYry m+gIQV1fME/Uo0ve1KWhcsBYfPQV9rzyrLHsdjD44UmOqnlYpp/LgGoQwIsuZpLZ3p7o L2W5eC6e+gZcxSDqu7kWB6FGxH7131cTh8nFVkPdnO1KpuqmRXHATcGvXvUPBBEV5Czn y/UQ== X-Gm-Message-State: AKaTC011/dJphkmAW3rkXJ4ixsRYvckcrLdC06J2TGOasLZXbNCZ5jOm4y1VOSqLv15BPw== X-Received: by 10.28.163.5 with SMTP id m5mr11602672wme.98.1481382677709; Sat, 10 Dec 2016 07:11:17 -0800 (PST) Received: from [192.168.2.21] (pD9E8FFC2.dip0.t-ipconnect.de. [217.232.255.194]) by smtp.googlemail.com with ESMTPSA id f126sm26145963wme.22.2016.12.10.07.11.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Dec 2016 07:11:17 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <3992956b-2511-fcbf-51f0-7f4627b55f0f@googlemail.com> Date: Sat, 10 Dec 2016 16:11:15 +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: check image size when setting it 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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index f855ccb..f713d3f 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -32,6 +32,7 @@ #include "common.h" #include "dict.h" #include "eval.h" +#include "imgutils.h" #include "log.h" #include "parseutils.h" #include "pixdesc.h" @@ -325,8 +326,15 @@ static int set_string_image_size(void *obj, const AVOption *o, const char *val, return 0; } ret = av_parse_video_size(dst, dst + 1, val); - if (ret < 0) + if (ret < 0) { av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as image size\n", val); + return ret; + } + ret = av_image_check_size(*dst, *(dst + 1), 0, obj); + if (ret < 0) { + *dst = 0; + *(dst + 1) = 0; + } return ret; }