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 A1816441EA for ; Sun, 2 Oct 2022 16:27:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1233F68BB98; Sun, 2 Oct 2022 19:27:53 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2093.outbound.protection.outlook.com [40.92.59.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B247468B877 for ; Sun, 2 Oct 2022 19:27:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lcp3QxbvFjjBYwKpMR0Rfodbg1i6aWA2q+eOEK25iKy9GOcTrQFXeYIkfJFQr6XAKokPXulNGiPnb4MKu5l/HEBZJrtVOnSJ7SLPpYQ8w8lQ5MGuQTnAQmBzFilojEH9g8Wmb7fI5Vcdc+frGzgQUHCeM1WdegZ3f14d1EcEFCopVEdNMEUwr1kp10np2R3fWoqjwG0i9yXFhCGaMNpKEfxFZTxJDkYpnbwjwCMoXGH+mbxZW8U6tqPKCu9DUW+K9YwwMwO4Nj/yw9t8rMtmr1ZPKckWZPwC5GvVXJwzKgL+EUu33ECQcLk4Hel8vYqCVqLgPfmqBF6zLKLn9ynOkg== 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=LXTye4DV6WXY8gL7rCPxApKIy8fMBv0mB/p/jjRvlmg=; b=dSa9OEN5Cp/ykIayQMLSSNdNg6Tr9n8rwfcY9I8OvcX2L9EQPAx1k26XTuc3AfMKGKhCEhnPLh5+sl5HVQmpaTlCmkIA7toC0+SAqGFjuwSPswamPADFLw9FVchcRFC/Gzpuzx48Xj+lUpODAHQSOEqxEWIT0tu3rQ/GI8zYazPAR8f1YjeO6qIIq12mQaddZCBpZZjT4Q7wzCEyONE8OZYsI6F/4izEeNLPcRoRBV6SBSohxj2vOZI7Jh3JtvJIDLEZq+T3iO4HR2zuWxB4AgucBVWi9AjKIGuSSmiH1JhFPMjIf0De89VUidVmsUCZm3JgHbZmlPpzeOd/cKlRtg== 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=LXTye4DV6WXY8gL7rCPxApKIy8fMBv0mB/p/jjRvlmg=; b=f3YvVg/nRzO1+CS1p9DD09HfIUINiYAWpF6UyIQ2OLXV15liE+/rv6XKx8ZcumRnbzF1PV2jg6GuaHNawdz3H1JEBVlOdffHthxuGYxQj+YIFh/Gsngxr+EyNNP0iGxz6FuJUwfLlz+rbpgwgcN7oa0TlCVcgKBHFCpJMAyXSu87sMqa0VWq/CjBq+qtg/zoa7QB/X0A9PKSSN0XA5aa76CGwtGJmYXjB3CBUdeRU4kZTCHRBV9vMe1VphCmXj3FW8sdY15qt0P1jDT8Q9n04xZdQL+VT9gGcGW/gR/hDMDvC5rUH4NFYA2ngHnXq6kinyNF4hfLFyIvXOb45/mMVQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0299.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Sun, 2 Oct 2022 16:27:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sun, 2 Oct 2022 16:27:44 +0000 Message-ID: Date: Sun, 2 Oct 2022 18:27:50 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [v+NDXV/jajTDltIuxZWrtcRcoFk5+q8M3SKo6jwMFTk=] X-ClientProxiedBy: ZR0P278CA0007.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <9f22990c-8b17-32cf-45cc-f3e7be07f2e0@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0299:EE_ X-MS-Office365-Filtering-Correlation-Id: 85931e4c-f285-4cf9-c183-08daa49308ca X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nd0NRWZ0EBWCu/ATOnSU8k6bDTJt4CWv+VF3FSheMKZT9ukuxK0JyVd4VC0tRJwggqPp6j0NRh199rfIA15NM3Vfz+Qvsl6LzxYGtUWDzWzBtukq2EhREfrrzaW2ngWwip3riAdPEnipeNIKqLi5r+gkH9eyxE1Hpl/Vzh41j6Pzubjl2F3jZ0ZCNMTLCr/OEk+FsPfoLA0zmccfIe410h5XaNtUqeEERELSn9L60b8Ax2tXPKHCv4APZ0PeMht1Z9NB57+TG5uQS+Tv+smpfYzOJbO3N5QOQha4oIsha6OZSO0F8F0hwwWffOrRQDGQNYQb3EUFdynsVrrwcRlftqpUqF0CinYx/JPUfuUJFsAl0W0dJf0OZHK2/kkTFDOgVf71fRS1+GlgCXI3sS2jmxo5bosOiI0b8EasD2OfeyNGXGel87RdpfQyUWoDbl3Xv/u4LAZ9pgP9fV5cDN7pKgUJlvBxQnMRwTubM9Jk40dywKNRmxp/a4tpzKN4/fM8NUj6+muqTbVA6zerZJse87tIg2B5QIJs7drk33qyeVm9S//24cUTq2sveDgGrdAKGWNyNmOqdmVuzhJ5gE3wJZnMgoh5SI64d5gX5WuzgRCbJUUYzbDEpfut7nKzSM7xC6ZyWrW82/qlcmM1yQJ2D4OSOYQHqSxhS28hgq1+eeiKYUqLQTqfRq21u9V+Qbml X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L0M5YnZCMjJuZDVYeWhuRnBKblBJb3l6MUJzZnE2UTFNam11K09PbkZSMnoz?= =?utf-8?B?aXFMWXBDcFdUNlZFVm5rbmJSZkpBRlFzcHA3T2o1YlcvejR0c240dFcxSTZY?= =?utf-8?B?M2xzZDVaRFZzOXY0N1BGampCOHpRSk83NklYN2hQSWx3ZW1wN3FMOG52c2tV?= =?utf-8?B?MllkbEZSUXNtMjBzS2ZuRXpQcGpUcmx5RVpPczg3SFVhbTN0VkNYcXF1RzlT?= =?utf-8?B?Wm56QWxWeTVOVmlnSzNBcDZhdE8vZHhRa3dTa3daQmVqN2xvNXJEVDdDcWxS?= =?utf-8?B?blByclY5aVlzSDdRaXFCVE9OTlFmc3Q0MmlLMjlndW5aaloxM3dLOFFjTGRk?= =?utf-8?B?cGlUQnZzODBYaWEzay9PallacWY0SE9zNFRLQksrakM3N3AyTFg1SDQyN0Rj?= =?utf-8?B?eHRnR1d5Ty8vcHVYYmpwei9jckpTcVZ6Vll2ZGl6amc0MGlna00wcE15akJX?= =?utf-8?B?RG5kalBXTmdnUE1LVlNoZzdDaVZPckUzaTRwb0k0MWtOQjRSWnJ5SUtDZW1Z?= =?utf-8?B?LzhMbTlvV3Jud0hYY1dSd3E5SmhvUnAxSDhOTmJlanhFNk0rL2tweFU0b1pL?= =?utf-8?B?R1N3UCtCRGJNUlM2c0djV3J0ZjNhRHgxYzBiaUNaZWRLU3d2WVJOQ0pLM0Zj?= =?utf-8?B?MUdxMXdoMnVTYVpaTGgrc3FpWDJUODZsbzFEMlE0SkxaNUhxSXBQUDFtSy9J?= =?utf-8?B?SUY4VFF3aXI4TFEySVpORmxTdlBhV2RvRG8yclNtcHhnMnJNUU5QVHRvODh2?= =?utf-8?B?V0ZJL0ZuVTM1WkhZK1pBQVdSWU50eUE4ck44NGM1SE1iTFJZUHFEeHRIN1RB?= =?utf-8?B?RVNXR0xtZGZyZ3BCczlYM0ZxdEJNRitiaGZrQkVCZkdoeGlLMDE1eXczMit2?= =?utf-8?B?R1k1RlRLVFVNbE02UURjWHMrWkcvZk55UFppS1NDb0NCTVJORFdFQXpXYjVG?= =?utf-8?B?UFlJQUdvQ1ZBNDQ3QlZleTIyRHY1T3pPcGVmK1lIY0dtaC8xWExqU0pxZ29s?= =?utf-8?B?cjFxUG1NU2luT3dKd0lBZ0l0K1lDb1RKVmg3RXhuQmo3SGF4M3RJNE1pbDJx?= =?utf-8?B?bWhNajE2ZkNXbEtKMXNURTJzaW5LNmVhNWJETnhVN2w0ZWhMaFFoZHIxRUZ6?= =?utf-8?B?cFlQMFJqM2ZKMEtEY244UzBDUlhGSnRBZ3VGM0ozekFVN0toeis4ZUFJQ1Zs?= =?utf-8?B?Mzd3YW1uekUwejZRZmxHdks4VW5lZTJIcTJiTTRsaGpUaEVNVFBXdyt0WEdz?= =?utf-8?B?azVQTkxKY2JnQVRMUStEd0pYay9xUGtoc3czYlJoNU4xaFhrVlN3c0VYTGtC?= =?utf-8?B?ZERxTUcrUjlLVkJjRXZNUXRzVVJxREF0VmZNckpvVlYxbmdhZ0k2QVUwU0ht?= =?utf-8?B?NUlLRzFXQnFHNVJGR25yQUFiNHJqdkpHVHNVUjZyU0Ziemo5M3lkWWg5Lys1?= =?utf-8?B?Y2xnbnQ4bnVlTHJPeXpIWXpIYjl3UkNUUG80QkR6Sy9RSlJMS3dXc1VMZVg2?= =?utf-8?B?aWNsMUNVdG9QMDJrZncyZ3JsZHhzOC9ZRnlUcmRhaExETklRNVhaYm9YOUV6?= =?utf-8?B?SkZMUVdNN3BrQktldEdkNUZKelRFc2sxSjR0REZyQ3BTb0dITGNaY1AvdU51?= =?utf-8?B?UVZRbmRlRk1na0FvK3dFUFA4UEFtclBxaG1JVWIxaE9Kd01nT1cxMXFKSWky?= =?utf-8?B?WXlXYStTQTV0OGh2YmU1VEljb0t4aC9vQlVnQWlRL3VuM09nRWFHSWxMc2VI?= =?utf-8?Q?peqqB1BR8OzalZW6sQPTrelifSrFOD0DSwWhMbP?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85931e4c-f285-4cf9-c183-08daa49308ca X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 16:27:44.2719 (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: AS8P250MB0299 Subject: Re: [FFmpeg-devel] [PATCH] avocdec/cavsdsp: Fix undefined pointer arithmetic 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: Andreas Rheinhardt: > src2 is used in CAVS_SUBPIX_HV iff FULL is true (it is exactly > for the egpr functions); otherwise it might be NULL. So check > for FULL before doing pointer arithmetic. > Fixes a "src/libavcodec/cavsdsp.c:524:1: runtime error: applying > non-zero offset 8 to null pointer" from UBSan. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/cavsdsp.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c > index af46eaf8d2..69420242d6 100644 > --- a/libavcodec/cavsdsp.c > +++ b/libavcodec/cavsdsp.c > @@ -425,13 +425,14 @@ static void OPNAME ## cavs_filt8_hv_ ## NAME(uint8_t *dst, const uint8_t *src1, > \ > static void OPNAME ## cavs_filt16_hv_ ## NAME(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, ptrdiff_t dstStride, ptrdiff_t srcStride)\ > { \ > - OPNAME ## cavs_filt8_hv_ ## NAME(dst , src1, src2 , dstStride, srcStride); \ > - OPNAME ## cavs_filt8_hv_ ## NAME(dst+8, src1+8, src2+8, dstStride, srcStride); \ > + OPNAME ## cavs_filt8_hv_ ## NAME(dst , src1, FULL ? src2 : NULL, dstStride, srcStride); \ > + OPNAME ## cavs_filt8_hv_ ## NAME(dst+8, src1+8, FULL ? src2 + 8 : NULL, dstStride, srcStride); \ > src1 += 8*srcStride;\ > - src2 += 8*srcStride;\ > + if (FULL) \ > + src2 += 8*srcStride;\ > dst += 8*dstStride;\ > - OPNAME ## cavs_filt8_hv_ ## NAME(dst , src1, src2 , dstStride, srcStride); \ > - OPNAME ## cavs_filt8_hv_ ## NAME(dst+8, src1+8, src2+8, dstStride, srcStride); \ > + OPNAME ## cavs_filt8_hv_ ## NAME(dst , src1, FULL ? src2 : NULL, dstStride, srcStride); \ > + OPNAME ## cavs_filt8_hv_ ## NAME(dst+8, src1+8, FULL ? src2 + 8 : NULL, dstStride, srcStride); \ > }\ > > #define CAVS_MC(OPNAME, SIZE) \ > @@ -492,22 +493,22 @@ static void OPNAME ## cavs_qpel ## SIZE ## _mc33_c(uint8_t *dst, const uint8_t * > \ > static void OPNAME ## cavs_qpel ## SIZE ## _mc21_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ > {\ > - OPNAME ## cavs_filt ## SIZE ## _hv_ff(dst, src, src+stride+1,stride, stride); \ > + OPNAME ## cavs_filt ## SIZE ## _hv_ff(dst, src, NULL, stride, stride); \ > }\ > \ > static void OPNAME ## cavs_qpel ## SIZE ## _mc12_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ > {\ > - OPNAME ## cavs_filt ## SIZE ## _hv_ii(dst, src, src+stride+1,stride, stride); \ > + OPNAME ## cavs_filt ## SIZE ## _hv_ii(dst, src, NULL, stride, stride); \ > }\ > \ > static void OPNAME ## cavs_qpel ## SIZE ## _mc32_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ > {\ > - OPNAME ## cavs_filt ## SIZE ## _hv_kk(dst, src, src+stride+1,stride, stride); \ > + OPNAME ## cavs_filt ## SIZE ## _hv_kk(dst, src, NULL, stride, stride); \ > }\ > \ > static void OPNAME ## cavs_qpel ## SIZE ## _mc23_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ > {\ > - OPNAME ## cavs_filt ## SIZE ## _hv_qq(dst, src, src+stride+1,stride, stride); \ > + OPNAME ## cavs_filt ## SIZE ## _hv_qq(dst, src, NULL, stride, stride); \ > }\ > > #define op_put1(a, b) a = cm[((b)+4)>>3] Will apply this patch tomorrow unless there are objections. - 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".