From patchwork Fri Jul 5 00:21:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4006745vqv; Thu, 4 Jul 2024 17:44:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXqIs0uq2iDB56bcE587cyxeFKV3ZVmzWe8EYBGKBA7XwYo0PvrOfpbtri5QtwNEercuJrCq1Ukc5HABxcUZqbux3OSaCAckA8Hkw== X-Google-Smtp-Source: AGHT+IEVoU3d9eFNEuyzHM5UsAkeTO8DkwyZBpc4LCNYrCrUSzPJ3EnOoUb4syp+LVI6FpoCeVte X-Received: by 2002:a50:d495:0:b0:58b:5da7:4851 with SMTP id 4fb4d7f45d1cf-58e5c828267mr1990576a12.2.1720140251425; Thu, 04 Jul 2024 17:44:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720140251; cv=none; d=google.com; s=arc-20160816; b=DzakpXNcWaqdQCsfzxEEntpLOak2P1cZ1s+DVNGtt3EisRLsLyRFRMwKcwH1qs1iWw xFwcU/nSgWfqeH1IOhk7VXPG306lh2/vDOTs3f7P910oOMEn4X/3xVE2vCn473SUmcGC dgYggH+wFbNeZNmfreeWUgp9g6caNIKUQBfDfwRwRkE9DBe9Q/IbEvIPiUtDd19Q1i6J FsQQ0iQOOwtEQ010HXzExYPaMgEUSPOGuScdgcKeFauEb9aJpRvwa70RCjD36FX0Kh8O 4zpLefim2e06TmjingJoakWEKXJu1pZ5E4sfWp/gJ56/rwyAHeS3qIoA4q9HXWaTX9cl lhBQ== 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=0IHxXUV5oFRQx1YYmcNKIhQJ1WKwcUEtIzwSvsceQJg=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=IhSqz/25JsTqVYH5ufV+JribOg/K63FGSeUZIzemI7f4Voxw7hyZL6FSFpJFqc4vnl nnyxsCC5OvPhpoTHh+5kY4PtUIKdWMZbUVxoblSaqWa4KSOTqrAK+6m7dZioqpoBOUmN zmB5ZHDwuaeN0LeXUI3pa7/WlySdR+wybS1sM3Cey6xM2oZSyqyKT3xxHvji7Nk1hibh sZmuy22ETmv92SuFkYVUgAK9gtaX1wmragLSam/MCzWk8PAPqUHfz/54pqHAQBHBt2JK CBygq85aorWh7Sd07VdxpS8z2t+e9e6+qfWZhCrn0fzw7uwcVB859Xcad7mGls3Q8xnK 9KSg==; 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="oBmX/HoI"; 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-58f6e2c50e4si351927a12.185.2024.07.04.17.44.11; Thu, 04 Jul 2024 17:44:11 -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="oBmX/HoI"; 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 48B4168D9B9; Fri, 5 Jul 2024 03:22:22 +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 423F368DAC1 for ; Fri, 5 Jul 2024 03:22:07 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 7A52BFF805 for ; Fri, 5 Jul 2024 00:22:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138926; 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=RivaORMlTknVRy9SU+AeShy2ESFcTlDTA+/aTtt160A=; b=oBmX/HoIqFm5zGQCvVEzOaPKNyvFX4+ZiGqIj03TwPWT9tKJN+WWYTxs4B2DjJY87Mi/Bv ef9c5xanA9shRKIUxW6VGW3zdBdVwmPKLnIaXFIRKwUJCr1rKVEoeMtZ7PYv7oGG3I30FA mDv+iyLxsIPhogbto4wC65vrVK4vXtszTVcFuUA4LEOpLEwoDdQaKmG1VDBm+IezvSDwTH A4ZoRoe6itIMwpyzubL/dXP2tHDEiIv5xiIa4NAog2xmhAb6ybIVoo0wdHjaT70bGwuQSv 6deofU+mCm7uutLTbe8rnwZoByFeTsT2aN0aBtY3F6k0fDdGx4tjoPcms2OlYA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:53 +0200 Message-ID: <20240705002156.1964272-12-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240705002156.1964272-1-michael@niedermayer.cc> References: <20240705002156.1964272-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 12/15] avcodec/me_cmp: Fix type check 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: 5kZTdXBIkKfF Fixes: CID1604375 Out-of-bounds read Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/me_cmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index 592ee760840..f3e2f2482ef 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -517,7 +517,7 @@ av_cold int ff_set_cmp(const MECmpContext *c, me_cmp_func *cmp, int type, int mp cmp[i] = zero_cmp; return 0; } - if (type > FF_ARRAY_ELEMS(cmp_func_list) || + if (type >= FF_ARRAY_ELEMS(cmp_func_list) || !cmp_func_list[type].available || !mpvenc && cmp_func_list[type].mpv_only) { av_log(NULL, AV_LOG_ERROR,