From patchwork Tue Feb 8 20:50:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1139057iov; Tue, 8 Feb 2022 12:51:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWLLTv3n+Rn7LAYJvIvKItRBtz68/haOPIuFVFKQ6mW9x5kp43IG5mcDPHmIuixkDoKQTi X-Received: by 2002:a05:6402:518b:: with SMTP id q11mr309248edd.173.1644353503588; Tue, 08 Feb 2022 12:51:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644353503; cv=none; d=google.com; s=arc-20160816; b=dI5e9NUZxc+y30DFCbLe7Ou1pD/AEwc0z57awFyVagjUXbipTVcNCumRCptXsAKB7c e3BxfF2Sr3OGQLUk4CSS+UMr39tCUTNttImsL/NA+TH2hiFR/FrPDRMfYYeMa6OVqkSU 7913si4KKn97igfUAgVZiJrx1OjYR8n6Z94Zk1bovME+ve44ypgimMpRNnPLvXWPjudd AlI3PIQobBAj9PYv/x2FAT1AiTqIXUlKSqCxoLXC1Pf3Y82xG7LG7nGSC4/W5NY49Dmi hMxkj0hnuhA3+psXyuqFg6kjwlvUYKDIKtUByEQto3OPDHicbnx8DlvbJG6pYuoRqNJ+ ugkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=c57NkkBB0kiMC08uPwVgLNpjC25uLbmgJOET0jY/EVU=; b=M4cZghgFpbAf9hMFFDqGUAxiEUGSH/mjjfNxsU/6z2jb2TLG1F0lPrQqFO88zO3Zc9 /XPC8UIBECqEIyJyYFwWduQtkduqxC/HevWGI+8I38SUkfeCerRZB3Z4mXVcsYjZahvg 3EVvwTxz8UhDGDsbkiJ5qXEtQjTUeeu5Ywak7Fe3ATCsaOl8JI7mDsCRweoYZ2UNa3lQ vVgYLxPqn90G/tZRjows8F12iEjxoOdbqmzOSA1DQ7ZZHoyHAnDNlqXLBuylqDUkU0Xy MgFoixeH/PQqrJkgs1AtV2FnxHGplrsr5kb+fAIjgSe7fC3J3ly1FBfHoLsOO4cUyGvC wIbQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sb18si10266867ejc.913.2022.02.08.12.51.42; Tue, 08 Feb 2022 12:51:43 -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; 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 5594968B19F; Tue, 8 Feb 2022 22:51:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EC7568B0BC for ; Tue, 8 Feb 2022 22:51:33 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nHXSX-007UY1-0G for ffmpeg-devel@ffmpeg.org; Tue, 08 Feb 2022 21:51:33 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id HXRYnEXViSgGFHXRYnJgts; Tue, 08 Feb 2022 21:50:33 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=TDNJ1QYds2QMvlMt8mgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 8 Feb 2022 21:50:32 +0100 Message-Id: <20220208205032.2013-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfIZxtXM/k48XFFYdC1+QwGfBAlMVLc4AmOp43zNhX226GU5i6VuFE+ie3iPzrg/uBuaVIoTvoquPNShD91GnZtobHYRvUSX9BzuyRBUh+dRXNuG8lZJI 5j7Nklf30JGT7deXEKA+/9P/9FOP984116eC7pcqaV46/oLwf33wvmSR Subject: [FFmpeg-devel] [PATCH] avcodec/motion_est: Fix xy indexing on range violation in ff_get_best_fcode() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oIRkGRiY3lsK This codepath seems untested, no testcases change Found-by: Signed-off-by: Michael Niedermayer --- libavcodec/motion_est.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 9c548c1567..4cf1afe888 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1621,9 +1621,11 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type) fcode_tab[my + MAX_MV]); int j; - if(mx >= range || mx < -range || - my >= range || my < -range) - continue; + if (mx >= range || mx < -range || + my >= range || my < -range) { + xy++; + continue; + } for(j=0; jpict_type==AV_PICTURE_TYPE_B || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy])