From patchwork Sat Mar 25 16:20:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 40818 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp143096pzh; Sat, 25 Mar 2023 09:20:57 -0700 (PDT) X-Google-Smtp-Source: AKy350adjbh+IOjHya+WdsPlhL5Yv9V+TszXktYJgxab9SzhhAq8dEIWAkL6Upo9hCrQi3GCze5B X-Received: by 2002:a17:906:af87:b0:884:9217:4536 with SMTP id mj7-20020a170906af8700b0088492174536mr6734415ejb.64.1679761257194; Sat, 25 Mar 2023 09:20:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679761257; cv=none; d=google.com; s=arc-20160816; b=MTmeAF4ENaLowRlHw3WrggsVW1jPxwHOjxIwwdLQ1oDSTzK1lx71jwGCiyMfxdEYgS /U9IuzQyJRVf+QRSTsQvAUCfqw3Q9ejv0J5yYJpD3FxCG2xHTgne0/72WrkB9AipSfZK hNJeife32eg36ngIavUoJnjjt47Gpm8jw0pN9BGYkhO3MCPqiHbdlEpQw9dvdXzwscTB sp8MArK2J4UBs70EYjMd6EVjy6Alz3gF4QsXlQbTNKuF8rjTw+T0kfpN9FhY3nWUwLZP JiHt0HJBdgFe7BFZLX61WMG2BCLK9B0DecgbZH3bstsJjnSzY57tgK6FpjS5E5N4NApB JBZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=fz4oj8VgDUs2vfhsH9ubdvemVRbkuDQd2wYyAEfJVME=; b=OqhjsWARqIux0a/Q9R7Vp67h0VReWZy84H//MlYrwpZ4aJV6tkdDi0O20pLSQd5Ayg xl9tOhNEOSn0oRScxmlECAIrNLPVKtiXWPAxgjFyqF7En4eSocGqNQareMzTr5NpI0bU GJ6EVzep3/7v/GGExdsSaGiH6xuX/ycv8JBXdDDqVuxDQbh9Wqp96aU/DNc2zmrJGKV4 y5jmO7stD7EjISt5LeqduDp315dNygJGs5p8GfGFzaDr17BcInBQWneOhHT4rm+KOSYr ZMqjHaCSZJmj2YHyJHPhM8fS+Cyud/aROqS46KlvijA2KQ84UyEDrFR/orrVHUPPW92M yaWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=YDzRi8cG; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sg9-20020a170907a40900b0093e3a33d7easi5092740ejc.451.2023.03.25.09.20.56; Sat, 25 Mar 2023 09:20:57 -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=@gmail.com header.s=20210112 header.b=YDzRi8cG; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1BCA868C96B; Sat, 25 Mar 2023 18:20:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3100568C95E for ; Sat, 25 Mar 2023 18:20:48 +0200 (EET) Received: by mail-wm1-f41.google.com with SMTP id n19so2752717wms.0 for ; Sat, 25 Mar 2023 09:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679761247; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5kelQv5Djp05OlitO90jETZa0hkO0F6oEvOCyv8QCGI=; b=YDzRi8cG4XqhuA5I9uItxleO89iCoyObznI6OVZZk50iHtY7wFYbfrk8STfj9OgxtS 0OK+dWygv9mfWZDBSknU4gzlF2uzMjU2O56K+HWz9LaDOOEkO/caUzPzUkpcW6ikpfqb FPKsGqG4sPQkB9mZ+ANiBnw1kNKO2GN36KiO1S7lqPKXZ/1ec5LAfapqJx3cGR2r1ccD 8e/mp4DIN+lNfRz4dv5ZtRT+wdgZ3RTLY2SEBkWp2n3nPjkmNL0omZzQ5EKHTIJtFgKG 5H2ebmJE8uK906hMg47a05rl6kZUpsmCrSR+KdP1oNS2mT+fUGDQcHw48zTUNwoXM032 Ar0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679761247; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5kelQv5Djp05OlitO90jETZa0hkO0F6oEvOCyv8QCGI=; b=Kh7z1212FihX6HwIoe+0fdEMviQHP5+nctFsp4mTKmq/mVb0fCGtOi0KHwTYiHqQVF R8y6QyDxCziqlYwiCt3xjKiLv8lu+tI+S5P9FT0vUCROSaVnRmJGNYRBw9nab+vQGtlF Q1sL9rtJl88xdjJOlpJge86UMbPha059+vfFDlas1dqt6w+uylI3EWfks3wmS36zaXAu T5nf9dbBqQCRqFLSaPqUc+Kx/F/312n/ionSNxuNf4O39n9lxpNrSd/dEej1buwDse0V rKmXk2WvNj/nsZQg7BfOXf9DoIRHGrvLfqr5gNNTUjDxe4wxKIDwJHc1ZE7Wvp9nG7ji H7FA== X-Gm-Message-State: AO0yUKVW/roTWSK/DgIEaiZFZONmTyZ8rrnuHVQB+1+4uHfEO1SheaTY sWtSGq0lxOPoEkRNOE7daH4I0M4w5cV4MQ== X-Received: by 2002:a1c:4b02:0:b0:3ee:4481:5415 with SMTP id y2-20020a1c4b02000000b003ee44815415mr5358188wma.26.1679761247003; Sat, 25 Mar 2023 09:20:47 -0700 (PDT) Received: from mariano (dynamic-adsl-62-10-98-143.clienti.tiscali.it. [62.10.98.143]) by smtp.gmail.com with ESMTPSA id j20-20020a5d6e54000000b002cea8664304sm20798842wrz.91.2023.03.25.09.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 09:20:46 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 06471BFB73; Sat, 25 Mar 2023 17:20:44 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 25 Mar 2023 17:20:44 +0100 Message-Id: <20230325162044.40815-1-stefasab@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/unsharp: clarify invalid filter param constraints 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 Cc: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZqeiSkYHNs1H Clarify failure in case of x/y building a too big matrix size. Example: $ ffmpeg -hide_banner -f lavfi -i color=c=white:size=640x360,unsharp=lx=4:ly=21:la=-1:cx=5:cy=23:ca=0 -f null - [Parsed_unsharp_1 @ 0x55b100e7d740] chroma matrix size (cx/2+cy/2)*2=26 greater than maximum value 25 color=c=white:size=640x360,unsharp=lx=4:ly=21:la=-1:cx=5:cy=23:ca=0: Invalid argument Fix trac issue: http://trac.ffmpeg.org/ticket/6033 --- libavfilter/vf_unsharp.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index e88e732c9e..5e17ebce1e 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -171,7 +171,10 @@ static int apply_unsharp_c(AVFilterContext *ctx, AVFrame *in, AVFrame *out) return 0; } -static void set_filter_param(UnsharpFilterParam *fp, int msize_x, int msize_y, float amount) +#define MAX_SCALEBITS 25 + +static int set_filter_param(AVFilterContext *ctx, const char *name, const char *short_name, + UnsharpFilterParam *fp, int msize_x, int msize_y, float amount) { fp->msize_x = msize_x; fp->msize_y = msize_y; @@ -181,20 +184,31 @@ static void set_filter_param(UnsharpFilterParam *fp, int msize_x, int msize_y, f fp->steps_y = msize_y / 2; fp->scalebits = (fp->steps_x + fp->steps_y) * 2; fp->halfscale = 1 << (fp->scalebits - 1); + + if (fp->scalebits > MAX_SCALEBITS) { + av_log(ctx, AV_LOG_ERROR, "%s matrix size (%sx/2+%sy/2)*2=%d greater than maximum value %d\n", + name, short_name, short_name, fp->scalebits, MAX_SCALEBITS); + return AVERROR(EINVAL); + } + + return 0; } static av_cold int init(AVFilterContext *ctx) { UnsharpContext *s = ctx->priv; + int ret; - set_filter_param(&s->luma, s->lmsize_x, s->lmsize_y, s->lamount); - set_filter_param(&s->chroma, s->cmsize_x, s->cmsize_y, s->camount); - set_filter_param(&s->alpha, s->amsize_x, s->amsize_y, s->aamount); +#define SET_FILTER_PARAM(name_, short_) \ + ret = set_filter_param(ctx, #name_, #short_, &s->name_, \ + s->short_##msize_x, s->short_##msize_y, s->short_##amount); \ + if (ret < 0) \ + return ret; \ + + SET_FILTER_PARAM(luma, l); + SET_FILTER_PARAM(chroma, c); + SET_FILTER_PARAM(alpha, a); - if (s->luma.scalebits >= 26 || s->chroma.scalebits >= 26 || s->alpha.scalebits >= 26) { - av_log(ctx, AV_LOG_ERROR, "luma or chroma or alpha matrix size too big\n"); - return AVERROR(EINVAL); - } s->apply_unsharp = apply_unsharp_c; return 0; }