From patchwork Mon Jul 8 22:24:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp28951vqb; Mon, 8 Jul 2024 15:24:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWCJVXJsVlZ3SpZJWA+STx8936vBDZHfQ+xyDn5cKr0LEg/szaSdtyVGOCV73wUNZKoHeWqFZ6HrKUJdLmvPBpY2JMECBOIicqeCw== X-Google-Smtp-Source: AGHT+IF0K35R75bkuCcnw1ryUgMw8OSngnBIri+t6TYmPKhCYq9t57FGVvj7F7QVpVGVloNLSODZ X-Received: by 2002:a17:906:8412:b0:a69:13a2:4f6e with SMTP id a640c23a62f3a-a780b89f6a9mr37396066b.74.1720477462861; Mon, 08 Jul 2024 15:24:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720477462; cv=none; d=google.com; s=arc-20160816; b=0TuDKIrXd6pCqoTVweZswdw+0x48YX6ge+U/NCWV8Rt+1YYaoMhmWOhk2aZb93rMMK P87fgGZkADDP8KbvzFTEOOrPLcrSGC/rsslxMuawUaxvqYNRR+klqXg54bEEKt1ZdOzn yp9dWVKZgDZ961KXtmpoFk0LqiJrUVlnmxtSyAITnwGixdPjU/rS7Qg40QgCKc4hrbkd ot6ZpFEJjUkDrUNEuVNYIcjs7/BvvSyn9tiQLW/HJPikTmiEoqDR83YQgr0HTryruQ7x XLxboQ6Xn2idtX6g+uZn7EDAxC65M95/s98cCoCIN0g2bQGAkvfvHDezqBEZqjqdbbIS 9GYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=ehqylZGZ2U7kbC+6+NN0vDE3jABqbsWuu9A6jfhXujk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=zQszmMNG2RPQ8lPP4LQfMFi2q5T0ghr0AdhEssFgbLay4PdCzFyacnsN/EplNM+6BY SC3qsOtb7mGy/3mHFgVEWeFjIa6j4UbFz/70FLb14kAF2CVqnv3HR1jMiwGa133r6i2C gN8eaBgLE7qJDk1KIlwciTqR3IXduHfsNDPkuAiSKmABV5t0CfkIGTH5dgCxXvEZ1M+7 9DICfFaTIhrRc78GuN0Qa5edXUBIDDiMF0YLy3Bt+AVxfMcLwLrDrW54AcEiiJooyL9/ cRlNEfAjMsOH0YFWrcGf3WqFZyVyO99rADHGrJ3BcMSdrI7UJHTmCdlIWFHqa5OUpLyf laaA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=DCF0yTTQ; 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 a640c23a62f3a-a780aae1e16si34438166b.430.2024.07.08.15.24.22; Mon, 08 Jul 2024 15:24:22 -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=@niedermayer.cc header.s=gm1 header.b=DCF0yTTQ; 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 328FF68D973; Tue, 9 Jul 2024 01:24:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50B3A68D973 for ; Tue, 9 Jul 2024 01:24:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 7DFC4C0004 for ; Mon, 8 Jul 2024 22:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=C42UUMmLJ2rNz+zipoJhGVgFDyw954f/QTKaDDM6U9Y=; b=DCF0yTTQpefr4y/ztQ+Jq3mxNc0gmynC7h+La0jZJLCSNDLuJfveAiHufhgTt2y2OUTAwe cYLsR/Af0VPX9UNeqIYalEd14zNP5lpakggoclI/rD72Kf0zVV4egl+IIOiGx5rSgGF73X lByHgwebkDYXTAY5xcq+fIO4HBNuhN0w7o5BYJSr6Yss6Wd24hTaSOkhEv4ZeBmGBE8gbS mCIywu75zaKd+6Qhd+t0KeSHZqdhYnODLwoAIpmCs12LvX/ugUq57etg26oh3Dl0phJEeA 0e1gp2Dx166ya6S64B35pI9P0TbUsJBKIzC0d3E2DGvi5NIuzskdcNNJR6Zy6g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:03 +0200 Message-ID: <20240708222410.773456-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/8] avfilter/vf_elbg: Use unsigned for shifting into the top bit 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fc4bxL3tSm0z Fixes: part of CID1355110 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_elbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index 732a2c8abfb..dd22da07b6b 100644 --- a/libavfilter/vf_elbg.c +++ b/libavfilter/vf_elbg.c @@ -195,7 +195,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) p0 = (uint8_t *)out->data[0]; for (i = 0; i < elbg->codebook_length; i++) { - const int al = elbg->use_alpha ? elbg->codebook[i*4+3] : 0xff; + const unsigned al = elbg->use_alpha ? elbg->codebook[i*4+3] : 0xff; pal[i] = al << 24 | (elbg->codebook[i*4+2] << 16) | (elbg->codebook[i*4+1] << 8) | From patchwork Mon Jul 8 22:24:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp29002vqb; Mon, 8 Jul 2024 15:24:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVaGu5EcnEA9BquO/Jcauh+JhyOUhM/XplCZPQiFSdftNh7iwoWi/jirSCRh9JbKMtyJ2PYsw/W7Nigcr+H6nW0LA3/IybbzeF0DQ== X-Google-Smtp-Source: AGHT+IGiUgj/pFSyqZBpN+9GXVJEAWmkplXSRg4yMHceO8SkfRGomQodKGXQDPgcjM9acSBl1rx4 X-Received: by 2002:a2e:8e76:0:b0:2ec:5685:f061 with SMTP id 38308e7fff4ca-2eeb30e46d7mr7765431fa.21.1720477473057; Mon, 08 Jul 2024 15:24:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720477473; cv=none; d=google.com; s=arc-20160816; b=ZLuZz3VxDYToBHqhqnBjnJvwB2re5kwl56thx5ihxm9Dh/o0v6Aa/DylSHinHZGPZ1 digD4x93/cy+LE4DndcVfTkeDbE4hkBUbIyExNClubkPi5ggid2/xRNG64zSdcVEAimA Jt+bLjWVpsE1jpQ7Ijr92Ylplh1HObYDW89D5lCHR4QbQbZ00U2NdVixo5Gt8gTw6Cax a89jBISXVFzFzUdpQQEx3DjyoDEQT0XeNkih0GCzA7FhfnTJNgHzdGWTYQ8bgqnixS04 PJ1zSTaa5gKGKNiXyD3H7sLrqMdOVxIXxEPP2Jb4/5DtUyfSohgHJbDUpdHhmwVmGAWG CY0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=avFGP71jyV/f4zHx9eICCyLeI5dezv2bcTLZ+uGnV8s=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=T5ea643usXTFVxlkL+CY05YGFCbCHpnGNCH+wGKH+lK11tSxUTQgB7eInFgrZaKT0a TAF4my2tI3y8IcUjuP3umn/UTH2yRcPH3ee5a0xiknYikGDBmDI5x9RcAIr0jf2gLDJm fpfPsMxHXMh3ThEpD6Ge/GrKc35ndEY4qRjszDmJGXKJXlpW2g9lnIWpliP1kwluDc5M smKvpIZANxVnFJqCB6kexYvlx76m/SFTg5r4Cmuc/BmfiekiZBulwqxFDleHxaSUa0l4 bIkGc9rkEff+Cghd22onj5WZw1wj+MFgSiPDsYffbfU9dmv0pPYl7qhXIciPm1qCWEDm vrMg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=l9C6meF8; 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 a640c23a62f3a-a780a9dd8b3si31526766b.226.2024.07.08.15.24.32; Mon, 08 Jul 2024 15:24:33 -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=@niedermayer.cc header.s=gm1 header.b=l9C6meF8; 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 6CF2268D9C6; Tue, 9 Jul 2024 01:24:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F4A768DA2B for ; Tue, 9 Jul 2024 01:24:13 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 73BCC1C0002 for ; Mon, 8 Jul 2024 22:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fFDt9peNAidf4ZJptH5yVrwvHgYMgvbKAFwjMPeCu08=; b=l9C6meF8DkY5MSOWmB13rk6dFSDdpzCcic59KOm/DklkIX0IRqBnl4lcOiyfVSUOMe/AEU n4GsX0s0rv8BC3TvgXXrWXgXYAumEA771xTTatO5XpgxkAlO4FpKZ7B0dY/IY/YCnuCw6i DBo1KDziZlSz/UPup0AdBxHR7bBTWwvhZeEVYZa1jkb7j3pw/xiFycYbElULdTZUr2G13V jtbSDCtgrqibJKc2PgSe5+TV6p0R40g1ehlrI0r8GLonDZpTT/DeYpE6ASGpvBIGTxdgp2 oahO2n0cRKop4p/oC1k8IG2ipQxROjiNvxY9TLtLdtqeEb4UEpKCK6iCiQCiLg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:04 +0200 Message-ID: <20240708222410.773456-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/8] avfilter/vf_fftfilt: Remove dead depth code 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HmkV0T+hvmWk Fixes: CID1509373 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_fftfilt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/vf_fftfilt.c b/libavfilter/vf_fftfilt.c index 1ffbe02ec41..af0e1f51d24 100644 --- a/libavfilter/vf_fftfilt.c +++ b/libavfilter/vf_fftfilt.c @@ -382,11 +382,9 @@ static int config_props(AVFilterLink *inlink) if (s->depth <= 8) { s->rdft_horizontal = rdft_horizontal8; s->irdft_horizontal = irdft_horizontal8; - } else if (s->depth > 8) { + } else { s->rdft_horizontal = rdft_horizontal16; s->irdft_horizontal = irdft_horizontal16; - } else { - return AVERROR_BUG; } return 0; } From patchwork Mon Jul 8 22:24:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50421 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp29052vqb; Mon, 8 Jul 2024 15:24:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZk1L2PUdDe6lG3W6OMCR4RqCePS9dJ8HK/TNJMEPnoDBpXTGtfeD6ggPmRvxttXRCZT//xEYnYoPwosVMnQMy8oqnH7nfyXC7+A== X-Google-Smtp-Source: AGHT+IHBDvc8CFyPHXn1vIDRE/cBePr4vBfoFtlctUOKJyVSpH/+02BeZDZyBo8JmzE57difVz57 X-Received: by 2002:a2e:9bd8:0:b0:2ee:8a8c:ce5c with SMTP id 38308e7fff4ca-2eeb31818f1mr6595361fa.37.1720477481541; Mon, 08 Jul 2024 15:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720477481; cv=none; d=google.com; s=arc-20160816; b=OU67UOxGObIxw4jrlZaUctXv7rboxFDAhwkebNqAsjKf9SmqI6HMhY9P7Jn5sgY+85 m9CRyiITnEJkvAeT7k0RtD5ze3Sn8y/sH22SdmGAXsIX5Sr3XUyWKNTof8nYJkYy7tch AEiGJedP+PcQFS2ETJrb8KlS4t9VPE3UXOT4ngcM9JxxINzyknvt/kf3JXJ05nQZHzW9 jdBTtCbEwwnGBU3XLM5cbff/tMgBj0S70ZCguytpJt2v46oAp6EhVHllFRoQtUf7Ef5i eOmjksy0fu5F9fFB342yfEd4i1oM2l9tZikShXjsdiFgSWNwSVG/ZrJlxbggAGw0lyNr zWkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=FMovIkeNKoQ1PlcqgRrNGElu9vTpq0k3ghGcuY39Ccg=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Zm3FKnqT0b0c0+QccPXa2rWN3fDZ+G2stV09FdxwqfAoQfodw6BPErGFNe4yM04RtF bNi4cByZEqsy/v+tWPB91tjz8EBCjSqgK7TF5k4F+6Rv2+PFaQk/9kVLNFof8VMvlCpY +iB7/f3eiChhKcHSXxQQRugdEld3jTFeid9FS72IaPOt+9e1O2QorzSwhVjOEqo85xfP bnJeG4IP5BCG9ALpmr61+jRzVdZ6Z42rSwHC4RS3AUnJI4O4D+Kukm5gi63EQyD/PkG/ UIkIl4TZn5v7NyKHGAdGEvbqbugjrgPJjMDDPJDsYMsJBjJf/mHfLvYQh1Qc+7OBgtr7 7Ghw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=ELALRqow; 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 4fb4d7f45d1cf-594bbe2c85esi272519a12.131.2024.07.08.15.24.41; Mon, 08 Jul 2024 15:24:41 -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=@niedermayer.cc header.s=gm1 header.b=ELALRqow; 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 DC0CB68DC90; Tue, 9 Jul 2024 01:24:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7128A68DA43 for ; Tue, 9 Jul 2024 01:24:15 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id A191F20005 for ; Mon, 8 Jul 2024 22:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9wjrz3ZldZPfvH2P6qnRhxwlR5p7N1uRWAOFLVAFK+A=; b=ELALRqowD8iOWSHgPgak2cpHx50hYJQWdS0aahuRhyDnr7hhD6hMglsr3lVQSAEW9Evxn1 0v61Kb0mlZqvKy6TxEz1eRj6irl1IqqPO0wvepF5UjcUWDF06TD9kte2hgSj84R2YpgHly g5UWxKtcDOXJGHbDXFre7komcRoDyjUrO9zec/71u6WtfIfs7XOKPmMbU0/BGfftkywh6K Wp+KUHHEO8T/irnZMKJakCu0L+S0xflKPq/4cPoqlGk8JtiJ+bbRtYZ9zUgH0cYbi9PjKe YioughUVk96NrO7cknSKZI6IRvwbFVPMUvMvWxfiYHL9N//zCv5Opv/XienP4g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:05 +0200 Message-ID: <20240708222410.773456-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/8] avfilter/vf_lut3d: Check av_scanf() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Rv63dlvG+0FH Fixes: CID1604398 Unchecked return value Fixes: CID1604542 Unchecked return value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_lut3d.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index d8ceb2a4240..929bf61b877 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -703,7 +703,8 @@ try_again: else if (!strncmp(line + 7, "MAX ", 4)) vals = max; if (!vals) return AVERROR_INVALIDDATA; - av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2); + if (av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2) != 3) + return AVERROR_INVALIDDATA; av_log(ctx, AV_LOG_DEBUG, "min: %f %f %f | max: %f %f %f\n", min[0], min[1], min[2], max[0], max[1], max[2]); goto try_again; @@ -1734,12 +1735,14 @@ try_again: else if (!strncmp(line + 7, "MAX ", 4)) vals = max; if (!vals) return AVERROR_INVALIDDATA; - av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2); + if (av_sscanf(line + 11, "%f %f %f", vals, vals + 1, vals + 2) != 3) + return AVERROR_INVALIDDATA; av_log(ctx, AV_LOG_DEBUG, "min: %f %f %f | max: %f %f %f\n", min[0], min[1], min[2], max[0], max[1], max[2]); goto try_again; } else if (!strncmp(line, "LUT_1D_INPUT_RANGE ", 19)) { - av_sscanf(line + 19, "%f %f", min, max); + if (av_sscanf(line + 19, "%f %f", min, max) != 2) + return AVERROR_INVALIDDATA; min[1] = min[2] = min[0]; max[1] = max[2] = max[0]; goto try_again; From patchwork Mon Jul 8 22:24:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50422 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp29100vqb; Mon, 8 Jul 2024 15:24:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0ASWY/MqNK7w8Z6cMiOPcHMJapr5YUYZvY8XfdXG/DWaCdKtxS0csek8EXjRa3n+KVyfJv4M0wRWl8aMYFPrWWxwZ9dS13O4uxw== X-Google-Smtp-Source: AGHT+IGWCGK56r3H0AfRKpXH71e9yXwq2aKnFAkncZhH6EbW2ACLW2uQa7j1LuQggJ8VGTPDK+PG X-Received: by 2002:a50:8751:0:b0:57c:5ec6:1466 with SMTP id 4fb4d7f45d1cf-594bb9605b4mr403482a12.25.1720477490481; Mon, 08 Jul 2024 15:24:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720477490; cv=none; d=google.com; s=arc-20160816; b=gLQ3WWPHSl+rbiu53euPujgB2m3rdQS86vPkliliv/uYUt2oH54wQk0xXxTMH1ieiv 9MVwjBKwp4RMnsQEfz2SIFWV7uPLuWFyzaCIki9GoM1r0RQxXeP+RxRlv7aB0od3KnZ0 KKg3AayyXeiyDncAtC4pEx4fIMBpFpvl3Uyah0NMMiLSsFcY3Ryu6ICp8Yfeb8aFA5qJ sqjwGbm99HzbyXs79vxiaFAeBwsN+wNPzOvALwlY9XqDPY6ssVFeSIAp21998i9Ul5v/ x/WbNF9vXVd1zjW+OVSTUCAYFero1X8wdabMuNeDoGzWuGMn0quxbsNVkeis5qOBNq1l cPRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=krl/5QYcRr+9yIebT/sOHXR8VkVIqizOXcXyCqhkZ2Y=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=b8Gm1CiCqX3v+a812ps3cnDNB58pi7/Aj0Kz1sjuxkCzbzM4lIc1+yy5CaCS7tYjEm HRpWDcPKr42zhFCGpkjwEkAtamt5lMy2R0YE1GVdeLNp5/0orCiKX1SWqZ9xMzuterFt fzkTJgiDHNr7evCebMQ/9Pw79cRJDueKF8JsnDFxHI1SnZL3+oyX2C1yrt4qiYmf9qyM KvlpAVulWp/JU62l+pDuCv36xR/qJWYvzBJshvr/DY7IGvfkKQc/RV3oOS1ql7THpBWn 0gVYILjCb+WieHGlAdbxB3oJ5hI+MoFPKShlP1LYAXfWJ78h1P86ddf0Y/darpjbDuvM +A7Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=DqnoOHMO; 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 4fb4d7f45d1cf-594bdf55ad7si284430a12.433.2024.07.08.15.24.50; Mon, 08 Jul 2024 15:24:50 -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=@niedermayer.cc header.s=gm1 header.b=DqnoOHMO; 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 3E44668DCA2; Tue, 9 Jul 2024 01:24:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6888E68DC13 for ; Tue, 9 Jul 2024 01:24:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C6A87FF802 for ; Mon, 8 Jul 2024 22:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fa55Hc43RH8T10FtPumNhRpSmWqY2OWo5C6FIZqibdo=; b=DqnoOHMOpN9UQr7nXKuhqlsjlngD8HPDbTFphA60MsFnLBvtZfihUEygcL61XusmdVjMJ+ RcsfpVzlb49jO2vzC9HrtlPxw1NKAp33DwjhEZRCE+OrFFD92pNsdZTtQU5gW6arFLPhL0 b+KJsOcqnaLAiyGnLuGX7uW7hDjJfmSFme0DY/t+gOD0mptHNtQe/CUwtkF8d36chEBlqf 4lqT7tIegLd3R8Ddvny7FlmIQaq7yWYGx0+Fsww8rbeix1x261tmhN2IFf/+TWm3QTIUiL QJViC94bJdan3nsOXJNy9NL1h4SlGyY6wMCP3VV+hvyOU6gS9zY4G7KedVUPig== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:06 +0200 Message-ID: <20240708222410.773456-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/8] avfilter/vf_neighbor_opencl: Use AV_PIX_MAX_PLANES 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZscfDAgiJAyl Fix/Robustness/whatever: CID1439575 Out-of-bounds read Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_neighbor_opencl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_neighbor_opencl.c b/libavfilter/vf_neighbor_opencl.c index b2939f841a2..ba661bd665e 100644 --- a/libavfilter/vf_neighbor_opencl.c +++ b/libavfilter/vf_neighbor_opencl.c @@ -42,7 +42,7 @@ typedef struct NeighborOpenCLContext { char *matrix_str[4]; - cl_float threshold[4]; + cl_float threshold[AV_VIDEO_MAX_PLANES]; cl_int coordinates; cl_mem coord; @@ -93,7 +93,7 @@ static int neighbor_opencl_make_filter_params(AVFilterContext *avctx) cl_int cle; int i; - for (i = 0; i < 4; i++) { + for (i = 0; i < AV_VIDEO_MAX_PLANES; i++) { ctx->threshold[i] /= 255.0; } From patchwork Mon Jul 8 22:24:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp29167vqb; Mon, 8 Jul 2024 15:24:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV5pH3IwJhPdt7qZvyReVOASA+97RYJQueX9fzECKfQk/BroZAu2s0pH2FhF1qI0PG9IQoNIv4jTPnNqoCd1lC5ZuaSmJHxyzJL+g== X-Google-Smtp-Source: AGHT+IGNmylLOmfhBD0QwZkbE5qqBDs5EnmX6e/Fh7q6oPIz6CVrxC+0u8x8d99Wximero29l6tc X-Received: by 2002:a05:6402:518f:b0:57d:5ac:7426 with SMTP id 4fb4d7f45d1cf-594ba997545mr490860a12.9.1720477498896; Mon, 08 Jul 2024 15:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720477498; cv=none; d=google.com; s=arc-20160816; b=PVqL7TeTvbkT8qU0nOS4Bpd1d5Q/fmpEIa0sr1bmYqKQtiiU7btmNI+wvs7OMNV1Rt iI8GKHeVC91Nc5uNtL89D7w61aFR6ID8HpuJTSa4eAu4sl/fMue9sGTraH0mFEgdQB/Z n3zwcD6OO+e6V+BfC9JIbEKrCSpOB9prv3kGPxC71rcuBDvsJGtjhxJFJT2qer/iY+WX 5iRAekBAzkXHIgD9agIKyrrlKwznqKuIK7LLz7fIIcrWW9VQwNKyuV0SbQuZaSyvfnfD M3wsY5bsHogVozPQd82PG2+IXskalDKXKkVNGn+J+TaRvc1RfnynVxICwbbDu97NKduf I6WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gwNMovKZFwH6/ugkniBJFMmJo4mJ+2yB541oQYta/C4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=poIrCcz/8iJ6kxnloLKN4ufUy23TwjI4TJCumvQiI9AKne5gCvauo9eq3JNTs6BwSA JUIfFhEDOgIdAAL1cs85L422JF0y+uxUCRXN24bfnGxix96XfZR+7sFCTAMjpiP8h2at jsuedJL/V4hQo50aRxGTh4xr75h74RWzsQzu1DnVKH0y3A+tmDgw7DnYN0gsKdmRgb+8 2q7/I1ZTjQlAUAt0LxplWkxjUpL6FV0M9vJR20XLP3WOU9OlV6KyK1ltf2KGMc7BMm9E UmEcna00MAIx5bU2sJzx49L+C0ZUNTIwiG4op9y5hD8zYY/lN8S/K1DZypxzKCfQGHQH Xefw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=B2gk8xOy; 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 4fb4d7f45d1cf-594bbe2c93asi272711a12.27.2024.07.08.15.24.58; Mon, 08 Jul 2024 15:24:58 -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=@niedermayer.cc header.s=gm1 header.b=B2gk8xOy; 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 2512E68DCBB; Tue, 9 Jul 2024 01:24:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D5FD68DC1E for ; Tue, 9 Jul 2024 01:24:17 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9C0ACE0002 for ; Mon, 8 Jul 2024 22:24:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zC3qJbZs5POIlzA3pD1VcxDB49MUcOB2Y4SElJTSdSk=; b=B2gk8xOy+d3euHcRneD4k/Vo8TC3IbN3PmVI6fv/rTe84M3Zb16Y2G6wc8p35f2lw/GJXP DGXZejAYbYl9zj4HHwSSsacMXsa7KxHgkFaEOjQXq7qYHZkgyTepRhXx6SPVbbnggesKkc fGRJU7CQPnI6bkiN/SJHSe8tfpNBb3nNOMHc9+KlWUgpoZnTDBniGMVEPNglST3QZaxTF8 855YVu5MJCkxI0fZ5h9E+nckMp4+CypH6cyFQtJ4fs03bpCi7BcZz5jzBkW1ByGPMbqWji 0sBYTuXLYQhyFe5X8JtDlciG9rBYkzbkFahHJkJ6fPko4SwilnLrcFnMkcu9tw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:07 +0200 Message-ID: <20240708222410.773456-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/8] avfilter/vf_premultiply: Use AV_PIX_MAX_PLANES 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YoeFJ9FHbmQD Helps: CID1435164 Out-of-bounds read Helps: CID1435165 Out-of-bounds read Helps: CID1435167 Out-of-bounds read Helps: CID1435169 Out-of-bounds read Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_premultiply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index e077d46a9a0..5e97c2000f2 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -36,8 +36,8 @@ typedef struct ThreadData { typedef struct PreMultiplyContext { const AVClass *class; - int width[4], height[4]; - int linesize[4]; + int width[AV_VIDEO_MAX_PLANES], height[AV_VIDEO_MAX_PLANES]; + int linesize[AV_VIDEO_MAX_PLANES]; int nb_planes; int planes; int inverse; @@ -45,7 +45,7 @@ typedef struct PreMultiplyContext { int half, depth, offset, max; FFFrameSync fs; - void (*premultiply[4])(const uint8_t *msrc, const uint8_t *asrc, + void (*premultiply[AV_VIDEO_MAX_PLANES])(const uint8_t *msrc, const uint8_t *asrc, uint8_t *dst, ptrdiff_t mlinesize, ptrdiff_t alinesize, ptrdiff_t dlinesize, From patchwork Mon Jul 8 22:24:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp32618vqb; Mon, 8 Jul 2024 15:34:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFgaLU0hqjcHSDqssb/QlPcFMrOCifmqpog0Hm+ebrzz6NsNO274wQBq/NYk2xozLfGIbP/H9LnnsVKc2roL+3AONwOBAgPNP2Jg== X-Google-Smtp-Source: AGHT+IGBgne9iyChnoanqGUM/mkY2PhjJsUpuQuzSMGHBRu5THqme02ZqZUgDBKDGyUtBsla5/c6 X-Received: by 2002:a2e:9693:0:b0:2ee:4c2e:3d3b with SMTP id 38308e7fff4ca-2eeb30b4c53mr5420321fa.4.1720478049472; Mon, 08 Jul 2024 15:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720478049; cv=none; d=google.com; s=arc-20160816; b=DkSzLp9ck8YE8gKybBbbytoYDBsiscwfDBTpVX1K07LIOx+neNk+i/vQ1UVyNfrJMh dtSd42amoSgHHpw+QcqHx70ooes9KCqNfSECRag7uVT6Za90ErxVPMwBp2tOy+KL+pPS 0ILPI4vboph6kIYMdCPVFDjfpEoNRxDrMrIlRiMCL1UMR23nz/L+usyLnLZH/wb8tmaw BOFoEqA24g/Wd4xsbI6VcN+dI9D/b4qBE+q0pVZ/Ilk1g6HKOITPfIEc8jDymPyi5Iff iTAjPLDBlDKsj/JlrjxJivZVW7PNzPlmdbpLwGxSKJ45e642091vjLHOBSnLCdvNhVzU qwdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=RkXgQ5VLZzZSHlBG+Dlx9rtGHjaPqtswDAVFDxeAsBQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=DsImoxKOxTcl2XgrXQkSFC/MWP0hy/EN5XX2is+0zEX6GbpayFbNxM2SzF5YsmpPX+ 7cAhGYvxxpT5U+eo02Jo57AsDk6qcR/cceBUur7rtUffk97Sx7tQTWTQZ7r7G5juc1F0 E4Torn2krVrOrlIKxn9hK1izkXS0FuK5aW2swjAwsw7zDnfh2u+bxQc/Qp3AfN/OU5Om gkgPfJ8PnGTlkXAczlrZ8hVVO3wAzy8LQw4H+vyUVWfjWhn9XzAAdPErnOmEGJ1Ztu++ MbWb7exsPTOFqv7K+IHTVML8/8918DgFfiuoQ8NNGdVebSiqjinFS1ALLUyKhr7ABJye RPHA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=j7jx4z+j; 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 38308e7fff4ca-2eeb34a0771si1282651fa.538.2024.07.08.15.34.08; Mon, 08 Jul 2024 15:34:09 -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=@niedermayer.cc header.s=gm1 header.b=j7jx4z+j; 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 1981D68DCCA; Tue, 9 Jul 2024 01:24:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77CA868DC22 for ; Tue, 9 Jul 2024 01:24:18 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id BD9BF60004 for ; Mon, 8 Jul 2024 22:24:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u/kvRYIZsI9AL6rNOXoLTRMqM6Q1D/yTtrljbkFGL+A=; b=j7jx4z+jyIozPVDwiC40+T4lcrUZcdEKZLPy3h8YGXhYfanQQ25ThaNHEZu6REwpjzLVoq V0A3LxrtFAjwHoou8IqqSpYJW/ZY5GU/UfF0FvVdGZYXVijolgTFA1h4MsVlDjjZ8tp69s nxnGMuNBS2lXRh3ialdM+hZluzMSZz9T/zOe4HtI50/jDBOFqrtB+snGtSP41JunLzXNqr nXx+tdCoePpj0JyFZ+E67+w3b7ZjlTEgLUonuthFTO2qHiOiamYbbbcN6KwsDujZK3kccA Ij/8t779jcENARzRa5vPzezyKySdlO3uCD/fw0A4SCwJjFmzBhPNhFIq8VyDZg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:08 +0200 Message-ID: <20240708222410.773456-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 6/8] avfilter/scale_eval: Use 64bit, check values in ff_scale_adjust_dimensions() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: A7rqDzpHdJ29 Found by reviewing CID1513722 Operands don't affect result Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/scale_eval.c | 9 ++++++--- libavfilter/scale_eval.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavfilter/scale_eval.c b/libavfilter/scale_eval.c index 75ed503f15f..dc8d522b1e3 100644 --- a/libavfilter/scale_eval.c +++ b/libavfilter/scale_eval.c @@ -114,7 +114,7 @@ int ff_scale_adjust_dimensions(AVFilterLink *inlink, int *ret_w, int *ret_h, int force_original_aspect_ratio, int force_divisible_by) { - int w, h; + int64_t w, h; int factor_w, factor_h; w = *ret_w; @@ -149,9 +149,9 @@ int ff_scale_adjust_dimensions(AVFilterLink *inlink, * unless force_divisible_by is defined as well */ if (force_original_aspect_ratio) { // Including force_divisible_by here rounds to the nearest multiple of it. - int tmp_w = av_rescale(h, inlink->w, inlink->h * (int64_t)force_divisible_by) + int64_t tmp_w = av_rescale(h, inlink->w, inlink->h * (int64_t)force_divisible_by) * force_divisible_by; - int tmp_h = av_rescale(w, inlink->h, inlink->w * (int64_t)force_divisible_by) + int64_t tmp_h = av_rescale(w, inlink->h, inlink->w * (int64_t)force_divisible_by) * force_divisible_by; if (force_original_aspect_ratio == 1) { @@ -173,6 +173,9 @@ int ff_scale_adjust_dimensions(AVFilterLink *inlink, } } + if ((int32_t)w != w || (int32_t)h != h) + return AVERROR(EINVAL); + *ret_w = w; *ret_h = h; diff --git a/libavfilter/scale_eval.h b/libavfilter/scale_eval.h index 2eb6970aad4..b4895284043 100644 --- a/libavfilter/scale_eval.h +++ b/libavfilter/scale_eval.h @@ -41,7 +41,7 @@ int ff_scale_eval_dimensions(void *ctx, * force_original_aspect_ratio is set. force_divisible_by is used only when * force_original_aspect_ratio is set and must be at least 1. * - * Returns 0. + * Returns negative error code on error or non negative on success */ int ff_scale_adjust_dimensions(AVFilterLink *inlink, int *ret_w, int *ret_h, From patchwork Mon Jul 8 22:24:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp32609vqb; Mon, 8 Jul 2024 15:34:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWnuso73ksQhk9xImr6gnjSypPi3w7XkJQh31DdRFLAaIrfR1LIN5sbDnQMeAhavw61vRs4KrQ5mSgIsQ6kkuvdUjOzHQ/d5vyX+w== X-Google-Smtp-Source: AGHT+IH+9E6424l1Aip82oq1nNNh8vnZK7hVlG9lrmq2VFw9+V3QnMFJGRTGsCXU4BorZrf3B9Y4 X-Received: by 2002:a17:907:da7:b0:a72:7d5c:ace0 with SMTP id a640c23a62f3a-a780b68a294mr65202166b.11.1720478052068; Mon, 08 Jul 2024 15:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720478052; cv=none; d=google.com; s=arc-20160816; b=i+fk1CcPNrnPOmdSmMQfNmsX6s9NNCubVLzcAbZcjiM2Jde2VrCdaBFaMNFaP20TVp BB0TDWjNdzFoNC+SCuVg9MUdtrYgL2zZDiChXkf8QbtoYePzjzyONOW9FEbiSWX/kRk4 0ByLnN2zn2sZ2AJkSA9w1fDbh4NEiMe8DSuJHvdTFdIU9A1QpTxWSAgwd8PYOakqB2Mn 1R05mEJvR28VBDPaVkEZdaKTdS/ejQkkVDxcwYGA2PqIuWUFLAvUw4gN/A0gnAUPg77b maLKc5M/ryNK+M1LQPoVm4lXfSvD+l+nbWYW5lV1zA0yN9waocfKAKJC3mCiHJEKZn3z MgQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=HC+VjfuJiK3S++JKXPrHgrGXu31iXsFVmd4CDZnyB4E=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=EePTiHEIsnQJLskJf8Hq3TdbJg6Dz6kc1bHOeIEhde+bN51m69FQG3ZQwMEmKvJgrI z61QvO1qU86w/zU9bFHswcwVwEw4BSiFCIZ6jsLqMqsqmKHZ2Gcz+NnFWpaf3FQgv7pG 1RXTk/wJe4DZM3L4CXyiR2ervOR5vXYNmPj0szVT396Y/P8bX+v0apUjoRBvd9umBTbN Iia71rKJqPKjY3QVqNtkrmZ0x6oGYPj5KuKqRFcMDVmUPUuaVNZygUeperQRMq2BIvNi AggRW+Bk81l0Ic2Ar0HkiI2poXu/2cPR0MISZpqJpGfWIkhm0dVK/E61JwFBEqS5pvCS evxA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=X6MscEpN; 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 a640c23a62f3a-a780ab2c726si32931666b.771.2024.07.08.15.34.10; Mon, 08 Jul 2024 15:34:12 -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=@niedermayer.cc header.s=gm1 header.b=X6MscEpN; 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 EBBEC68DA1D; Tue, 9 Jul 2024 01:24:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C1A768DC18 for ; Tue, 9 Jul 2024 01:24:19 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 92F851BF204 for ; Mon, 8 Jul 2024 22:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0W1lVMhMnw9hAF+pvH7WyagEdkd5iAH7tbN6JJaYQ+I=; b=X6MscEpNs6kD240nlZ1tl+j9D32lLSjt7LAisjMFgpaBZJjpsCWVXaqZIP/ZcUemxbKH7G Sw98DY2ummOLJ1wxHbTE4wEd0NQCyxTkp5ksy5xM9O4CRj2eEhTlAGWdneQTnOL/584LFd ua01VC/5Z8NniOcDgiwOl9Zw9bodi6nSvVFjnEhtprqF5VlTM9SSWBqWyZjmZXxAbppDjV 9TMvekhlJuV6tkkCM6NjyPwP6+ypYDoLqDBjeAZ59CCSdNZqtOgJBDSH4eWDzlPs1d0Zg2 i72oAdKXACzLyT+08qwQQ/X6mQv+0SCVoCs3Xy27BBbyAZsjMX32gcuE/NsIZA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:09 +0200 Message-ID: <20240708222410.773456-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 7/8] avfilter/vf_scale: Check ff_scale_adjust_dimensions() for failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7B6AU8X//BYa Helps: CID1513722 Operands don't affect result Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_scale.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 841075193e6..bf09196e10d 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -638,10 +638,13 @@ static int config_props(AVFilterLink *outlink) outlink->w = scale->w; outlink->h = scale->h; - ff_scale_adjust_dimensions(inlink, &outlink->w, &outlink->h, + ret = ff_scale_adjust_dimensions(inlink, &outlink->w, &outlink->h, scale->force_original_aspect_ratio, scale->force_divisible_by); + if (ret < 0) + goto fail; + if (outlink->w > INT_MAX || outlink->h > INT_MAX || (outlink->h * inlink->w) > INT_MAX || From patchwork Mon Jul 8 22:24:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp29335vqb; Mon, 8 Jul 2024 15:25:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7YvOdujnetGXn9mXA6GvWGc0ZgRzS6C0v2pSkynfj3bWL5FuEtYdBcTgW68PySJGbB7UE20Be+i3nntRjVHuRPEl56VgzGuVYyw== X-Google-Smtp-Source: AGHT+IGsYgRJldlL9CWmrL+Ji1OA/XnZHCWHhudCw3T1ypCMCMRGx0Ya3wiPKzciFDC448JOS635 X-Received: by 2002:a17:906:d553:b0:a77:cf09:9c4c with SMTP id a640c23a62f3a-a780b89ec4emr65307066b.67.1720477526547; Mon, 08 Jul 2024 15:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720477526; cv=none; d=google.com; s=arc-20160816; b=w+JdP16rhct7GfJSEfytT8Guhi/t+/9ZbNKlwHIHmkICP1/bDsT7qHB3auM0hUiBD5 C1KCb2ICM0zi3/QOWsUJQiTTpneHRldLpUhSIT5vVdsWsnQBzvt5HDlG8RoynbJU8hyj xE+7xsi/ofrOtO3WYdz9AID1QRCpfWuY3Cser4SeC5VSUdxrfDAobH6pXZgr19gi15ir tkKHro6nL+DqmN0qKsDCU7TUT3WLylFx7jsLFMk97UftZOo5JW0IUIlh+WEmqyDy8F23 DwUegKirOyUViInyaX2qAeCrxXVewSBIZEZmoeqWPR3S3QkcGYfIbYT1YZ5KtOQq3+eK xudA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=na774DwjMHomotBRPSRBl6vhYr5weAd5hCAbyCNCb0s=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=EONacKiReTWUvvYoojw13cgrbgBKuZJiP45Rjq88wZBJmfT9oeaf1u4kBC+YEZ6bLZ ABZtr0+uE9hOaea9I+fObZ894+650EVJioaXVEfJ3CYDRwix8eslo56lTq4BdxSbkHLy zQCGiHXZYd5taE+s8UiS83OtKl8af7NuGFmraEQFhgZJW+K77rIq+jC3kMlMA5N0QDhE 4XmByRU1mmX1lh15UGShwjlTkotHXxkBtAV2rp32mCs3AGUThGS0NakMxxx+LIrAdWyp qjoYZb44qLWTwtTBZ1E378TbpQUPvpHXIf8dEmnFeGb1dMvVwIuL+HLUTpBBBFMZMvn+ zLAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Eu+w2OcU; 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 a640c23a62f3a-a780ab2cd9fsi31380166b.762.2024.07.08.15.25.26; Mon, 08 Jul 2024 15:25:26 -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=@niedermayer.cc header.s=gm1 header.b=Eu+w2OcU; 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 2F5EF68DC92; Tue, 9 Jul 2024 01:24:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0620268DC8E for ; Tue, 9 Jul 2024 01:24:19 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4A0D7E0004 for ; Mon, 8 Jul 2024 22:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LU2rn/xf0vBJRjASokmxZ9i0wE6HY4ChOQk/g6f8bcY=; b=Eu+w2OcUXpg+kxiN/+1QMgTX00wLJ41huL+xo8azJHCjvNyLysidXhYvsGV+QvkBnkBVU9 YCSXJauJGxlWrk/16fliQsBlLuPxWoKJ9gYQ0YCPfltu+K8T+AMUW2mdlWE6iYjpaWbxEH L+e+w4Ht21hr7QmHXfF1FMvt68Dz+utghkFOd1oSlIFtkqFOH01Arkc2/NkTmnIc2jz+6T u5aP+QLZdFHg1Bjia7iszjOxrGICrWAcx8gS1S6hb3eqc+ihZ5PTr/dvD0YW+f3Ke4rbgJ WaGc16HnY2Lf5ZcBwjb01DRpZpc6lJhf4zz0jp/ftsAYmT34wtlA2a+jZb1IAA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:10 +0200 Message-ID: <20240708222410.773456-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 8/8] avfilter/vf_scale: Cleanup some checks 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: in3j52ddZR79 Fixes: CID1513722 Operands don't affect result Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_scale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index bf09196e10d..120ff473f2e 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -645,10 +645,8 @@ static int config_props(AVFilterLink *outlink) if (ret < 0) goto fail; - if (outlink->w > INT_MAX || - outlink->h > INT_MAX || - (outlink->h * inlink->w) > INT_MAX || - (outlink->w * inlink->h) > INT_MAX) + if ((outlink->h * (int64_t)inlink->w) > INT_MAX || + (outlink->w * (int64_t)inlink->h) > INT_MAX) av_log(ctx, AV_LOG_ERROR, "Rescaled value for width or height is too big.\n"); /* TODO: make algorithm configurable */