From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DDB9740E51 for ; Wed, 9 Feb 2022 02:39:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAFC668AE72; Wed, 9 Feb 2022 04:39:30 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95D1B68A8DB for ; Wed, 9 Feb 2022 04:39:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hlSXt3wZXrjWdjUc0d916RDL/rfHf7cDmMSePyFVMnuAlE9pdnv4XQPaNb1x/h6Qj2pDKFy4nI6Fvq92aNscz9Lj6+eeOsfRc0achP0b6RIiiDj0yHW3IbODzgVhhJuri1wZEKZaf9lX7DoCY+q5Zj4MEjW5ZcOI6xU7jB+oASRxtTbwh4i7XS9Ax96384PpPjm3AB+QkPUFcs6LBmerFy6vrh2vN4LBZ8oUYsdqim/JC1rM3MHhkaokLiXoQ/Jk1yaj+LLPYVGIfzE9LuuwK71Dy9FSU4qeMDql2rPXw1HMzmg8eF9pTS6Ql3ySWGw8jM/K6pc0ahkUjdDn3+eUAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=42RksI/DbWZC7xpBA2OBnEOJO8VApXuoWaoKNVuhFbk=; b=GE5cOLxZ1rYpwyRdu4H6946uiOSptm9F8BUAXDfOxplMgPtv16uMldEM9+WC4qt4g2NQ5QeY+4JLjUcjhoXgPmlGT95R0dkwXLQht0powGrJlqyVGTtMst+nXCLMvvwILRHzPnUHMRNXsWU0b5HCJIdZpVBRqJWJXFMqaWkQTkO/QJVg4KRzHYy7ZhPg9qxqtgs0luQrbflXJln/+LU8A0dlffsQ8JAZCE8Cm/tN920wXEAlleUeovHMT7Ae25yXyTp5tuiP8KdRqIEK9E+/q42CClkrwU2S1Ogj1NpF46IoEp74NEdGIOgdburBqWC7thkixrCZLCORKdlgbqgJHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=42RksI/DbWZC7xpBA2OBnEOJO8VApXuoWaoKNVuhFbk=; b=gjMIgxIytVq0ciPKQUEQh/L2Kp6su8OxwyUe8a90CrdyectTAlkprypMyG/qDl88HXFnVI2srNUHecZ2q1li0LNWi91d6ZtTfHpFUB4+8E7NWlLaij+dTHsLY1xDZQaT0rBpVsimdpquO+Jp/m//J1WQH3l4qztP2aqoWpeXg0IQii+uFzf/n4QFY5UEqOkWrUhrpPxklBv3f4Bj3QoD7//rkZhhPQ/uE8X06oZbQ1uCNLx4yz00/hNTynFVTKnNaGAqJ4zgc0nQdBddCKzV4mNnX94R8XJez0JdmaGL2YL9AA0KuXWMa+m+pxtm0Of/8vkk6Ye+VtFCI+y0i45XAA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6404.eurprd03.prod.outlook.com (2603:10a6:20b:1b1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Wed, 9 Feb 2022 02:39:22 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Wed, 9 Feb 2022 02:39:22 +0000 Message-ID: Date: Wed, 9 Feb 2022 03:39:20 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220208205032.2013-1-michael@niedermayer.cc> From: Andreas Rheinhardt In-Reply-To: <20220208205032.2013-1-michael@niedermayer.cc> X-TMN: [eZiFUo8o+xcQLWOXJpW6OApDHZf5Tb94] X-ClientProxiedBy: AM6P195CA0107.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::48) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <942ea8d3-8517-7d57-f076-d606d0b0b574@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 17564de9-0178-47e1-1e37-08d9eb75611b X-MS-TrafficTypeDiagnostic: AM7PR03MB6404:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jeaAsUTzS1C0vq2Z0xRCtIFgKNSJhecydC/PevXRXlbwfR8KPvHu1s+dL94S/8oS+i9pbpaYXBAcv+sZWdZWFUpFXza4DSF5879eRbNKCpD2KkVvt6fx7KfnncUU9a/sQNpgq23/PmFK464yc+SStI637ZI552xogDKllyCb10e35Bdh8epsde/fDuvMESijYHrmOu00GoSwnPmrB1BQ/EtGNoJQfkruJzMd+HaXTvVln2o/ZInkej7e8DubmjiTRHwObe6qvDrxtf+3YZpGyXlUeAIyRKRS+YJ/9GJ7i8MZiVQeoKvZQ9wM2L29rAmeyI7YqrhJxEL6sa5fHiwEqgYfmAWlZXrEws5RtvjF4tDesjCHUUkiDB65nEVKPXEkA10SL0BPtMYP8YD8gNwQvDPnVyPY56kbOxpwjGhcKwdO1rOM2diO1IR77WYTNp9bmiEHySots45AjJrKu2J9GONU3jyFOhlsOmTT78ufnjJjrWSNTmQq6t/sfbAOEotTf/AOeM9X1zgEsi0eGSxgrVm551gNdy0xjOH/ZBvIknWCId7vdR73cDN0oYst1pgdtLFLlAjwhi9DWW0pUr8wUg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Sy9QL2REdUZwd081YTZHVnBhdnVJa2gwRlN5L0pBNEhlQzdEOXhPYU1PNmky?= =?utf-8?B?M3luczJORXNRNGM3aE13UmRob1pVa1gvTUpLZ05Ma0JRSHBRbloyQ3FjaVgw?= =?utf-8?B?U2c0OXRvZDF5TGYyaUpBZVVjQm9MMVF3dEVsbVRkZjMxc0xTaEh5NzZyVGx4?= =?utf-8?B?OVpzOG1rU3dVdFZEWWplNWZNU3pBTVEzNExaTEtxUm45T0VBd2tjSE15WkY4?= =?utf-8?B?MXdzcVplRjFxU1pkbU45cXhkNU1SSjNyQm1FWTFBcUlMM0dCSytaRFhOcHBL?= =?utf-8?B?UHZia1ZXbkJnTTAwejV6QkwrT2VIYWpKSVBsc2xTR1BlaVMyK2R3OEthcmdS?= =?utf-8?B?ZHF2eGdOek50WGtKOTZsY29kWGhjaGx4akxMRlNkOStSVmVCaVA2Y3MwQklk?= =?utf-8?B?TmgrTzZlZlk4UG05TkxTUXNaNVJ2b2EyNXNjYWdZSExKRG9RRGdlZ21JRE5u?= =?utf-8?B?dWRyOGF2ZFZ1TWZXa1h0RUxEWEkvQlIvVVBwZkdiWUcxZElEWnh5NmRMVmRZ?= =?utf-8?B?dVZWQjd2Z0paY1AzV08rRDd1TUc4aVFIOURicnhpenk1MHdnUFhzR2hMRld6?= =?utf-8?B?eXlHNTByQUhkTUZuWVlVTG1Cdm9xdGZ6a3dHTlk0MUpHejVCenczaUo0dGNH?= =?utf-8?B?Q3I0RmRQMTVSdm5hR1RmYXUyUEFSQ21wdEFyUW42eDRRQ2tnYVBaRWtIZ1Zk?= =?utf-8?B?SHFXUGR4QUh6V0hDN25JOVUwZWgyTTNWeGFiSXhGck1ZdFpMbWNXQytTblhm?= =?utf-8?B?eVR3NWQ3MXFRc0Y0Z3psTDdOaEhseW5yYnJjVXc3V0JSeU43MG5IclFqV3J5?= =?utf-8?B?NXBFSUtvMWtvZHJVc0dZZG5JUDB1bHFIeG1Kc1pLSTNta0NBKzZqVCswR3V3?= =?utf-8?B?eWNzU3E2d2tHRlExcSsySS9DVzc5cnR6N0l0K3BpYlVzcGF6cTI5dXQrdHhy?= =?utf-8?B?cUZtTXQrYW5uNThSVlV2dlpnbWV2S2kyTzlaS0xwZ0hoRVU2aVNtejdIWFZO?= =?utf-8?B?eHhjN1puYi9Nb0pYekMvRStPaXJoSnNPYlErSXhBeWlRaVFIUzZCK3pEWU5Y?= =?utf-8?B?UHBoWWE5V0VrcDFPSDNlRU9Gemo5QmFMV0srL2llcTR2Y0hkRnQ2ZnEwY3Ru?= =?utf-8?B?TElMRlY4R2IzelJkK3lWQ0MyclZiNjNIdWhjRmdjRHE4c2Q1MkoveUhNY0V1?= =?utf-8?B?bHJTeE1yWTM2U2JvSVpJanBLL08rNnZaL0tYRS8yUEwyWWNrNGdUMUtQWldk?= =?utf-8?B?VFJ3c3JGcTE4YTkyNDBaNCtMTU15RXNCVmRDakUzdWZnQUtQZz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17564de9-0178-47e1-1e37-08d9eb75611b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 02:39:22.5316 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6404 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Michael Niedermayer: > 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; j if(s->pict_type==AV_PICTURE_TYPE_B || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy]) It would be simpler if you added the xy++ to the outer-for-loop and removed the other xy++. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".