From patchwork Wed Mar 1 00:01:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 40558 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2475990pzb; Tue, 28 Feb 2023 16:01:40 -0800 (PST) X-Google-Smtp-Source: AK7set+0wCIyi+nVwKaZKMjbEEO3J3aaq7Agm24s3JTL3dp1FsfuNBm04eOn7g6Yt/PKJFLyQmeb X-Received: by 2002:aa7:c845:0:b0:4af:69b8:52af with SMTP id g5-20020aa7c845000000b004af69b852afmr5160326edt.24.1677628900671; Tue, 28 Feb 2023 16:01:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677628900; cv=none; d=google.com; s=arc-20160816; b=d4DZZfXzb0qcytgVKuabtUAzFcqH2eEVmYSTcEZX0lK9EoOGV1RYQjg7PtLPWcfnma QWBIuRJR4XKaw6PM+0XG/mfc64bOOF43NfrHSCdZThtEDvOw4aVPGuuw2PQnGd/0CQc5 qgpJ3ukk6F5FEwPJhI+JYyNDV8DPk29MBaaZgytwOb0heq/cBo9hDrMDjoCkLL+oIKGR ucJQDHjpR6W5AhdP6iIAWwdvYcEgfF7MfVNCGRU882F99UctpBUxYD0lAAJT1P7bKHCp bfzhoumwZfGvQPe5JNpX7CLZm0hxiF0IzxUYKKvLJTngAfykP5wYLikE0SZA/lIanw3n yGaA== 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=ozh5SS8vm+5L8jLQFPZS0V6RVboVwvv6SLX+ah860Z8=; b=UJqB01mifckc2UmppWrFt3vS9s9aOo0B2QK2TNoDbV/HsactKMaS/TDV4pEAA+GQxI KSNzWfNN3fUrSMvsmiYuh14K3hrW0lTmSb2gxgHs2H2xWe3mM/siMpNGTCLONU26JoEI 5VjFrqtmSA64dSpAah83Jxj5dKT2h5ob58q2u4r3hLSMsvtN4KTjLzIOwmANFLEoKfQh pv/YqAsKZY8IT13KC6eK3lIBDUjZDeSoC9nUeO6eVL8Xu8apQZkQFRgcc93mPRx2h5AN 6MhxvKhpADVRoLuNFhtJHGAc8zLtKB78ykkdFu/kjPjTbn4SOOx7M3rc2Zb8aOLgb08w uCaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="AxFzVHq/"; 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 o3-20020a056402038300b004acc4685827si12962328edv.436.2023.02.28.16.01.39; Tue, 28 Feb 2023 16:01:40 -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=@gmail.com header.s=20210112 header.b="AxFzVHq/"; 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 B6FC068081F; Wed, 1 Mar 2023 02:01:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18F8D68A8CB for ; Wed, 1 Mar 2023 02:01:30 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id q16so11542422wrw.2 for ; Tue, 28 Feb 2023 16:01:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iCggHYg1/xSgbSj2/wrTItDqt5uDfpBSyNPGzid6aWs=; b=AxFzVHq/woLaXT0xeOFdalg9f90UW/SVt4/yMKwK5ZEO4UE2UOgrK7YfG4ELelWTeC EPqYK7YJc/tMWjBKMWfqDIm7FnOSBYa0ZTMKmn6LhwhLerBWCDbmwv0PLPIjLeMKRXme cgu1Sw4YlPBBReU2cNEnunP/1HaqSgMh6CrcjIwOT/2mC+qSEyx4hS6e5B+P6E5CV7Et p32Y80NR0Kb231xgP6wtpg7pkAVJfRRBZ1DuNdQ8jyPoPF6aBz3JWidnwf+9IqdJR69v fQdkjonkakUBBt/5w0w9O8blqLTV5SfdzBMCXrRtditzoGb8NMktEzYp++d4nsYwQjMV R9Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=iCggHYg1/xSgbSj2/wrTItDqt5uDfpBSyNPGzid6aWs=; b=avSJuGV+jPmLVVxWbZ8wp6ZFIiUAh1L7aRWcTuDPuJ+XlT0JhHObGMa1PsX7WFNyju mEAfWOgC5Wo1jq2t8tCzn5l5073Aq3GGpdR657DtoicgWjp6x/RnTd4kmAMdGMDPkG42 7Jp6TU8DukXTirybyrpVDWkZHNI4acc6ti1Dz2hiyUJbx/qTMuFKtTSV/S4/yhAwtV2y no/xJjZN41DS9fH3+ecEt/RSLvvVOKzLzEWOhwGhx6PtvhgF6LVHMPNg1BM/6mrarPxr BwEHoYLlfh2SmjOlyHfMRvXBo80tNgoUGwFRLuymPc3DzhhZDaEt8UvjKZTcyc6wtn2+ /LwQ== X-Gm-Message-State: AO0yUKUgqTCnO6sPwPU3cj1QsbIxo+L9jIQyRgsE20/siNkseXYf7I2/ H4K8iQum/sbFcrhklVl1GlrrgqNACpBYwQ== X-Received: by 2002:adf:db92:0:b0:2c7:6bb:fb7a with SMTP id u18-20020adfdb92000000b002c706bbfb7amr4081715wri.54.1677628888670; Tue, 28 Feb 2023 16:01:28 -0800 (PST) Received: from mariano (94-37-133-75.adsl-ull.clienti.tiscali.it. [94.37.133.75]) by smtp.gmail.com with ESMTPSA id v16-20020a5d4b10000000b002c56013c07fsm10873975wrq.109.2023.02.28.16.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 16:01:27 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id C891EBFB73; Wed, 1 Mar 2023 01:01:26 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 1 Mar 2023 01:01:26 +0100 Message-Id: <20230301000126.49666-1-stefasab@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/buffersrc: issue more specific error in case of invalid parameters 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: nOsJm8FKIQX9 --- libavfilter/buffersrc.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index ba17450b93..ea9556d691 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -273,9 +273,16 @@ static av_cold int init_video(AVFilterContext *ctx) { BufferSourceContext *c = ctx->priv; - if (c->pix_fmt == AV_PIX_FMT_NONE || !c->w || !c->h || - av_q2d(c->time_base) <= 0) { - av_log(ctx, AV_LOG_ERROR, "Invalid parameters provided.\n"); + if (c->pix_fmt == AV_PIX_FMT_NONE) { + av_log(ctx, AV_LOG_ERROR, "Unspecified pixel format\n"); + return AVERROR(EINVAL); + } + if (!c->w || !c->h) { + av_log(ctx, AV_LOG_ERROR, "Invalid null size %dx%d\n", c->w, c->h); + return AVERROR(EINVAL); + } + if (av_q2d(c->time_base) <= 0) { + av_log(ctx, AV_LOG_ERROR, "Invalid time base %d/%d\n", c->time_base.num, c->time_base.den); return AVERROR(EINVAL); }