From patchwork Mon Feb 26 22:11:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46552 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1641741pzb; Mon, 26 Feb 2024 14:10:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWVqNO1+S2oqWmVCZltCRFZlSXAi28jOdwEMzHoMkpSPtXambCJQ7oCGxbPLH6rNs+6z78+zkZ8IlFZYUoY46QrT3P+ZLIibAmJCA== X-Google-Smtp-Source: AGHT+IH97VSsQsKixlEzFfOFp8dZI+KXq0s3mN39RM/UcGaijzucqbv3cdKWc4rjjcWcbdY1rHrb X-Received: by 2002:aa7:da54:0:b0:566:200f:362f with SMTP id w20-20020aa7da54000000b00566200f362fmr1360284eds.8.1708985409380; Mon, 26 Feb 2024 14:10:09 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y3-20020a056402134300b005648b002d91si126093edw.524.2024.02.26.14.10.09; Mon, 26 Feb 2024 14:10:09 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=F0UZSaww; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8280C68C5E2; Tue, 27 Feb 2024 00:10:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2104.outbound.protection.outlook.com [40.92.74.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B770B68BE7C for ; Tue, 27 Feb 2024 00:09:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g/yknkH+yxAI9pW8VLWsozO/zIaO5ThO1lozfHuQhHSc0R4btW2O8P0wg9T47WOQnvmQeAbXuGiAHMqLZh1bX5NgnpKIfvDvamdjS2mEXeTlUWw4bfvqZBmbSlGEQVWsyJ7xprCu+TEEQ9JC319iDHHjH0hydlReVAZHRIYwn3LMZGYsIeWIJ1wP6GU4LcQF8gcHrzklMnpEK13lECrAaKgbLQlSEnOlA9KOgBG3GemrS6DzHfpKBjA5DjUNp+aInXu9pmepzAlw87lt1BMUszcIWlh9H0WSqMzN1QI7vBN8Ryxo4lG8AweAJoKdN2UlzpFRNsxsG9+NJLtndEOhaw== 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=GXFT9QMliwKMcF/IshLmjqQ2nLf8UpfL1QncKiQmBx4=; b=HLXENzS0k4gmswcfpGd0OKdYTlrPRNtw3avajxn9b1iPvzevZ695ccySBiJ8zSCKK3w1gCQ8qRWbCSzbuvIEQUpWgUePtTOSSvRanrxzZavbA/OXrIDtsaON5NJ2UWqo05NjA3SZ7PR6H7cKavpOLtCjX3uzn5tVivsVOIBlfwxxnWM5MG+wpvDYAfLfXcSj4lesW2MxACAVZgeJ/GOOTAzfrs+a8kYbHAigmECeNN84dFqlHU6PbKqUn46HP3R+tGbZbhCgb+47XEohzs42b2WGWAwQ+LIiIQ4X0vq8d3uGY4LBb9YTKLE5UffvYd2FGliEWX3ERkJolg6kavhOhg== 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=GXFT9QMliwKMcF/IshLmjqQ2nLf8UpfL1QncKiQmBx4=; b=F0UZSawwibedTG+h74S3bldVNpgMqypxpAoKThiw4FStAE/VGiZm+Fk+3Kp9ubl1EUTBl9VYIPXD+LIPqsjWRKC+2+/Ry5EJGTV7G0LE4lk19tUttB+pKSAKXTrJOwrPT6jcv9a8AOsSCpby/6Asnvi29AQAzpbCO2yR+WnKJKnCJJAm+6jOt/hdTM4WBeVz7fqoMJhFPcKBJ76S3iN7+cFgUeN+rxvGPnDYbcQWYEZh+8Nb/Bb7snfykjj3of5owzfky+pbpU0DJ0Fw2vuLtEeCYPTfaTc8mXesIQ9dPmlDlqQMh+rP2xAiSdm8AkeE1BeEjJaJZttAnuLfBdzXxg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0200.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.36; Mon, 26 Feb 2024 22:09:57 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Mon, 26 Feb 2024 22:09:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2024 23:11:48 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Ga8ZXSkF2YXYo9B4x5hrfyY5MyAkxQBnD4H2PbNriuw=] X-ClientProxiedBy: ZR0P278CA0023.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240226221149.335226-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0200:EE_ X-MS-Office365-Filtering-Correlation-Id: 4fe390de-10f9-41ed-9955-08dc3717aaa0 X-MS-Exchange-SLBlob-MailProps: obhAqMD0nT/Dq3kpG7DNHIyToigSJC9sc819NDCO0adi/+bXYTRKGnQctfDgvOf70eCLi/WgLcSpiKY5eE42sp445JP4S6Fx582tak9yzaaEIhecPVz3RSDVRRgZCfMfqEfKNqDXfKSH6xX1H1Z5gZYsqPUMl63pzRd/jYBY46/jY+gs+O8zOVUXyK2xIy/vMLJ+6/KadLCd53OhXUSYLE7uiR+bCk2//5TxNy+03O1K1Ldx53j8MZIPt9xlTxzTWhfHl61QSaPtonmNIiOyI5hSNpZbEGwDoDP9ReiTk25Mweg7bFv6i5v1sKuf+YaANJc3aou7fP3bAOrFMsBRMUJDK68I2gq6qBQLfyf252dpvklmoJzFOFvtUl1Tii+8+hkVWEunKorWf7aT0nH4idW8UBH5lG+yxLvimKZzO1wH66lVAGLSU+YOTUwtJ3EjIBGl2yCHUPJZFw0mKmFycOMMHE+fE6JCOkUi4cVQkWQvCVYRf/iFHiUhHMAHz/+oSz+vHRlUIBaP2Kh+I/THAiBBvzYeIEGRGHKIxlOq0ipkBu/zd633w2LgTKI7kr7Iy0xJwERXTmPiUTAb173CC95GhT1A1is5DE+I18PvS+RlkXZm7n8lWxwZIKdAZ0/jHZtW8DYKT/SEXGlHSo2sGjdRsB8O/XlpegGry7oNli7yHK2Jyv9kCF8uxGnuSdkMtlsSsG3QLjEfAMF/j4arpW8Qe9LR6p7w9Iq8uIviaZpZIWTOgqWJkNJMdsgtTZL1Mt2kgHYl8MsZxct+EBI8RnBjMvcIDLNeAoJteuYL60dClR7f8dyA5ablLY/7w/gT X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9cA3VBNT6Y8xWeOHbsQoFg+5AfXQPzr66KG6HmVh6pjli53Wa+F0N7NymCNcQkdIjJBnxZeJRUXHmSL73wAT104weZ6fZw7Y2pMBtuUmU8BS5UC4hVqXpMOirKrz8/yRZ3+IXSLljD5TvDaklteVc6QKyZkq3s/qEJQCRFMwV5FwfOVlOKZwiSF94sKkqrNiaHKoUbnhDm8MT3sLVeN/jVxueWIqNCfbDnKHWCWfQIv+QOXeU/meBFOZsS4TcS9OzDZ/P1qb8q3OycxHFDPH81dQYoIpeKtX3LLTM8Z4O8KrTSL3ZsROD19o7iL2/DpQRrhElTfHx66eLSrVW2vL6pWk9iBFdBbt5LmjgWwimrIdNk+A6IxxqyMfRGil9bePsaPUQ5uwsSLY4MAcJsK0U17aObE2C1OjXyYnqPWPt2VCjbK4BP5AXV5X2rL5Spwg3u3kMUhQ1KwVu095KDaLY7e2Azfm763t1S3dPfyty3yVUuPjbS/xtDI+FdV8AfbsEZ8FjOFW94vRs06jZRjD2/BzEWtSqoNDW/G3+cdtszX/OZZryZv2p4rugMi77qaZ/OEWt4tDCzqy6+SrOeZX+7p7CB5h/V2vTx80eNmiSJzd9xL3e9KJyq2m5/Jrj3h0R8Kj1sOnuKuAwzd96O5ENO/5qmY1Nsi3GGbYuYMjMyG4y8IEK5GnM4vbTNIxPQzW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q0sEYp/gYUDMf61G0Ktfs4FaMpgdRI3FMHLOJ6TJEJa8/k1y0FyZGXvJDzp2nYD1GNrTUA4wfdwd0cZTSoyU411o/VR5A2WhMVVa9cudyNQ649tBEr2pJ/u7+5w6abZXSYpuC7tzwb8wn7AcOJjBGthh1Jbj3aUKF50j1U8NGVYXsig+MUxPvsEbOiMtaV/fESGINre9UJfgG5QuEjWx42rRsXOltSVOccZErQkf/3q6dFPylrfm7XeaxUAGVWuqVqhPclPian3TexS4efdQ9r38vg31khN9CmUuE/7i9gcjzRgyJFsDDRsUildOHRU+8SNpcsYbOeaymd1gULEV3fMm9O0WXYuy+2HVPIP2RUOAM7gcy0xcBnCCMG2Ggaf6iN6tuJc1ppUqk7yQVJSBWVWFuXmgpkjfMIyvck31F2SMRmzUUvEWUrkRUBd0WwEecw9Bs+qvBocDgpoS3uQA437J4NsK0J+fvjIvsSfpa2cht4++HKR5xwCyjJw68ar+AkVI/bXLeuIKXe9ke3zl53EKMNPvZMgZNGZKPDcREs0lWvSeYTPhUK1HwH0CIxnTKvyULBuic60KVE7ZJuHzqlwwe/Y+u55TzxhWIOqn7ExSLfiP7Kd0LQa+pzEgTigbgSyXL9WJuRJANAutfNzLpN2e3uTiIm3EA5VjBm/6ZX0UFQnyMfkDHF7lK2Bshz6Fk+g2gtmVsQgWl8/qpOLuUCOGsBTa6fzG3BdMnHc7dcrFKv/pDzWdgWQLPtaeUXOOkSlfUXEu9pV48XLCiu3CJU0RTBBZumyqSOFibyunpXJNJjvevw5iej1vcmUwzuPyzDKONdnXoikcIBrFhHx/zRfbzF7qNKZhuMDRn5Hohb882cg0kfb8X3xOCJfzjGTfqRW4SYG6sFk+aUeG7WfwPMSM2Pr0Z1lPobSqXNbdMQgxgLLWWJXIb6knesOGCtf1RBXVBFDHLkBJ2ykuqNDyLjWLXBOxPAv4PDsJdHDTI4h6yitJBnO4Q6bvDhV16oKa+zNKgxpfYiWKmMAJPlUF7cY4YtvJMXwqeSBX/cWJDQon3UQvtvtGsXdrRN3icZKrcw1EW/Ng2DMDOYOZolVs8HKj6LySxApM6g9Wb4Rc/Erj6JMpn5SICNKNKCKTvB01x5VZmJIIISQh4zM9m3otpQjDLU61Rti6HUdLk3MRussc8wmt4ZtEpAmBqcZ2h5uAfg1ENZjj+yVF1uRMj8em88DaHhcWG3OtfZY8q/8MiVL08fQX4WYkCfBMPwj/3qGQRuU3roiFqqcyfxpiz2WPlw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4fe390de-10f9-41ed-9955-08dc3717aaa0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 22:09:56.8062 (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: AM8P250MB0200 Subject: [FFmpeg-devel] [PATCH v2 1/2] Revert "avformat/mov: zero initialize the index ranges buffer" 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LWke8bhDwEu6 This reverts commit eee3b7e2fb0664b889e58c03f76e19ef23e4d1d8. It has been made in an attempt to fix UBSan test failures with GCC 13 (see e.g. [1]), but it did not help at all. So revert it, but use av_malloc_array() instead of going back to av_malloc(). [1]: https://fate.ffmpeg.org/report.cgi?slot=x86_64-archlinux-gcc-ubsan&time=20240226182430 Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index effa46120f..71e8f7ae8f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4031,7 +4031,8 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) } // allocate the index ranges array - msc->index_ranges = av_calloc((msc->elst_count + 1), sizeof(msc->index_ranges[0])); + msc->index_ranges = av_malloc_array(msc->elst_count + 1, + sizeof(msc->index_ranges[0])); if (!msc->index_ranges) { av_log(mov->fc, AV_LOG_ERROR, "Cannot allocate index ranges buffer\n"); return; From patchwork Mon Feb 26 22:15:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46553 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1643461pzb; Mon, 26 Feb 2024 14:14:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVhL1My5XQ7aYT68oWT2d+SjQ18BE7fyYEVI4pfzefBzujm6yNn1gI0soGiNBxynvDcUDBMmMxQNWT4Q0FA+uBTiXOBlPyHJCUKJw== X-Google-Smtp-Source: AGHT+IHKEMTQTJNcbdNsk3Q0xw7Ku1azMq2FiVHUmQS1O9LroS8n8ph6VkSSXJghYsiCNsWI14e5 X-Received: by 2002:a17:906:a08c:b0:a3e:53d9:c7d5 with SMTP id q12-20020a170906a08c00b00a3e53d9c7d5mr7290031ejy.36.1708985651178; Mon, 26 Feb 2024 14:14:11 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sd20-20020a170906ce3400b00a3eaf97ac5esi124746ejb.922.2024.02.26.14.14.10; Mon, 26 Feb 2024 14:14:11 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=l+is0AtP; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF94868C900; Tue, 27 Feb 2024 00:14:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2087.outbound.protection.outlook.com [40.92.59.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 393D668C462 for ; Tue, 27 Feb 2024 00:14:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NxjL3S54xzubsL37nYKI7SuyqZTTIWdUjwalE6KlEofKA1/8fRLZgbf8c/Q8MG7RuIrzRtzCjGy9ctgesMi+WOoUV9YUcRUi8B1df2SW4LzxPeOrMfjHjoz1GcVvzvyOYRXwYksMOqyv8fdusOw9h4pteBu7cLAQ+OJ6+BL01nmo7U/SMi8J1nlLLQUJW9I4AB9S1I8OnPFLIjhzo1j21yEPB2mH2S/7f2wIHv4DVfxSvFYpMjdQVJhgG655T/CGKAzge8TiyE5DmAuU//OnKaUBPs79PRkJIk9YNTZbYPIYH86MUjLstnv91lix29lr7esDYzaf5yuIYBdDZ7dc7A== 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=YnRq6EcP7nlQ4+5uLW1s01l0zAfQmMxp206vsxyLNBQ=; b=XKrbaIYYIQ+ddUuApFCl7F8MvdvPBGXeWMVPhQD8neJkExvQXpGU4anhLsEpWKuhvBOuVjckNF9uQ75XvqQKUBP+n4idTfisxtiYYXsAmrOBIC9NIK/F5Lbq0/N/hRJlzwrHAJjyjrQPTjl5X55cbWLtgq/FDwiGgNU34N21kwtSD76t6/6hV3gk0V0UO3lj3F5/DzXIZAu8rNWl0AYBR3yr8saWIbzAG1Ow9TmSHPKGXERqxmyPp+1QwrD35qYQy1Wv8db5ru603bzvVvGn0n6tptR2FMwgSdaoTEZkCUF9iNB9RaCsX9fCySyb0DTzvFzxoaMNJ64A+JeAdv+pdw== 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=YnRq6EcP7nlQ4+5uLW1s01l0zAfQmMxp206vsxyLNBQ=; b=l+is0AtPmUvLAg7YIo9GRUgCpVv6k6tGUKvddkClDmJuPBxUq9Y0wo62d1b1OIdSVk7IO567E04JJReFHX3jOba+pSx/JasaVX4Q1ULXp6PCLJ6pBV8dMc6LjhW8LJ5KJMGjWtfRqAa8LrPTI28JvVLD3ZXAtONjHtBud7O2HPKYmuSGvoObxsiSDs9JhsE/f2UbHNOg9NwswkEOUtCErwF8PVd1LFlgw3p6+qvMwIEp79rB3FfQyVLXfsJeIYjeBLO5CkbV6fGXhSd+MIfAsuukOQWqTBPjD+kH19kfLDEunvsQC6fkdXccj7lovsKBQ4T8PDXKGutx89Z0rsJimA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0200.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.36; Mon, 26 Feb 2024 22:14:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Mon, 26 Feb 2024 22:14:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Feb 2024 23:15:50 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [gQ3AwdLclvORTvBB0p2CVAnEprRQLM/IG2mxvh76dO0=] X-ClientProxiedBy: ZR0P278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240226221550.384722-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0200:EE_ X-MS-Office365-Filtering-Correlation-Id: 85ee07ec-601a-41b4-3fc4-08dc37183b9d X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoQWGgFdnk/XrL0kWZR7YPnvc4RKZxWuVBxEpDNeQ66TKAs+2aVH2dpRsm9vmADIipX9lmVVQI1RQeuUEGA90+GCcGdc+ttI1vUTEU5dvbuIAi11bs6U4fACfX/liGJqoq3HeigqWi1eMlQY2zrIHkTHzttU39yUEsLNMoulmMtybtlCDmGv2C05tA66j0qtbHLJ7agY1zTRDoHct3qvMpBaJwvlKgH6uaI0yL0+dlTjGeGQvcMGw2SomV6OdZkf3Q0j0HN8jtVW6uoosVGKI1Cs9g9NJ/nQAnjP48HDER3C6Lxtmv9+RkbMBUQgjLkUuKKzaBQrra3F81czSIQa8KGd5n/Yauc4nTJW2tYujKGw4eDKv9Fpjjnayq8giXcQpOMQX5dE/Sgt6UNltHU/GDoUQV8xyH/v1K/fJkZqjXqRhJHeeO5z54VFI6u89xECnUqc6BiHSTVVXh+Y9YyoOH8dJCjA/MmWUl+oNAk4UBn3lm96tbQMlU7fueHPDpgSYjytogJIhsbYVPRg870gOxP4LQWw68KCFdQlL2VuPKLA3NJzYA+7UyybovNX9yn65c4XyoUCWJlgNhwCCu8aeVErFxEsQE/HiliqcxpMbwgdcNoMD9diCkHP8A0HwdhEXAd9uk7HG9bvmjajtkphP/Ed8nuF+uhxVZv6yamRAd0/fz2bfwJa9Ge77rrm67xDmHWffCq1Br68FfJh7qBkoqxszc8ODTb9mZjSh29AP7YV1xiB83TfSVqs5V/bYOfwlk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9aAO5Ass9MoTYRM/tbk1Np315B010EXFnce1VRbnsNEq9Ja0GLpE8yOgj9Jz/s/59FJSVs3PsR8tL5FWEqlsK/IM0QWPb088+ak1Q6HY9bxbH+UhrYZbrLsyyWoE+jaitabGgMKxoTXpTly/3Ls5XnGxNkaG7m/i5yw0rTKQb7SH+oLJJG4uteTjCuLnyRp4GdepXAKjVJoqogb9SPOzePcz4XI+SogEZEwqE1/Yy/9QSxrt7FuehtSu7cls3mVwmHxlJHiQeb889VPUy98Fh69EIHnoc2Gbv6MwrFLwkkkch9YVqJGZaCSgyD7skgK9/rDSOkp34QVHfOqUakSO+wzd8T0u+gT4uZo2hCeLl5/+H2GRIXOP+VN/6lb0z+Z727vmHhwr//t0tZEPYI6iUd74i5CLoGHkWx5kw+6kvSIhFibCXb6elgHiK8jSZwgwL2eRkQIbZWAh1IOnp1hauNjOewnhoTSIRVFC64pLQYumgCxUhWaVfc4h451eD61AdMr5LGgUQRoI7I26DuKIt8CESW5NFEfjqZlCxk58XnXx6IAAqQwrKSvnDlHfmvDohIqQhLPFhDOx1q5Y4XEW/YBYV6H8aE5kBmkFMT8Gd6rDGho7JFrhVmbYe9EZC4Gi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yOtBFYC612zgUONk2a1yY/DT3IhbXiTKXnYvX0lS/1IIVU55n/Vpo8RFQhmULBqwxuZS4kOEilzCCa0aflDJ2I4StqDoViV+u2VaMAPg5AoDd7yHhsU/5HjHBqoqe6j0dQuNN9asNjI4EEyPvao0RoYbqQRoUr8ATD8eacTmR4xekt/vSpGAHOwAX1zw1yVbNHTFUhi/q092CF17Ua5d5mfhFh/4YH0/K1pyNHV3pn6Bg8sNJ1yvlaOuVuWaLwUqoDL2Bg6AZ51EL3WUCS6kqk1WoZDNJBCP0pCkbt92lsvl3qpPKvI4RLd/9LFbYsbdhpB6e1vJkk/5v7eW/VZ7hJSD8Zf+idlWIieIvxmzFvmz2rzWdQNtQLLPJ0SGS56A4RDrKYKo2Atuxtq599oDld1g6vSSNdtF6C809dY69htN4zhtAej6PfzSYO+4Bl8vqZkQgTa29j2v2wqxPDO2hP3qiFw74DKTJr3c7wXrWjHTXf30iNNB2HhVfl/P4DYxafzLAgzQhIpCZnztTkr9nPHbHQpjlFdOSFEN2onfGM/dhJ3Fse+YIQkRlAjkeyGGRC0+sTkrbgrnyPcx4tgL38/z7BM+AK15f7j6hfT7h1IdR88aSsJsZobLMn1YwmbZQt1jInT4kfMX8ltBXM3djVNq9Jx2mEoi9g8XtznbNIV2u82TSx4AzBFHeOwZpb1gCREgTYQ3PDcHw9O22Xpp9BMXcRPTNyXvNPnldXCi756dP9GTKG16vz9kD4PedW0rGCqcABm1Cl0qN1F23+LplP3LxIyLthP2gh0mO5he766IEPEhOjtRtiFrq/s6BvMh1yoHjE8o0AKJFlrg+tpxX2X0mpub8rm8fhzgy7Lh4pWPIqWpwnjPG+nqLPu9tmM0Ufsl20Cd68BgAtuF2hNJhpYWtwpL5l+qbkhNogp1W0x+2LQtuAJafNypQPlR72NFU4You9PqdtmvPPqjBs6BOSM+Y88PSe7BVQxuQinzT25VdOHOIJPloqIIjBCOLD+CEeBDfY/6/x0zhsw8+acrofUQ3g2/azJ3lrMDMHnFeMPCLLfftiPGxBFVY9MiSO4rxSEVGhYLkZLjo0wL9lqC5nnarkvvy1vu4HvRmDRJeF0gvGKg7sK8sbHhTccPam24XtfxaPFsXNQi3nHTWLtPbdokQK5jb3UbGREWB52tLCwfc6yR6pj4oB7DQjBIdhw4sEYyfgtV7BUeWe60nPfAWI4fRTIPqu+SUeyHMMpv/3FTAebooi+D0LjLB1q0HNauLU/BgUyF1V9vU0y877kiGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85ee07ec-601a-41b4-3fc4-08dc37183b9d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 22:14:00.0276 (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: AM8P250MB0200 Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/mov: Don't use entry[-1] in 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BnlP6mg61WFn It is undefined behaviour. Fixes many failed tests with UBSan and GCC 13 like "src/libavformat/mov.c:4229:44: runtime error: store to address 0x5572abe20f80 with insufficient space for an object of type 'struct MOVIndexRange'" (The line number does not refer to the line where &entry[-1] is assigned.) Signed-off-by: Andreas Rheinhardt --- Now switching to next_index_range in order to avoid having to duplicate the current_index_range == NULL check. libavformat/mov.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 71e8f7ae8f..d7da19998b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4022,7 +4022,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) int num_discarded_begin = 0; int first_non_zero_audio_edit = -1; int packet_skip_samples = 0; - MOVIndexRange *current_index_range; + MOVIndexRange *next_index_range; int found_keyframe_after_edit = 0; int found_non_empty_edit = 0; @@ -4038,7 +4038,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) return; } msc->current_index_range = msc->index_ranges; - current_index_range = msc->index_ranges - 1; + next_index_range = msc->index_ranges; // Clean AVStream from traces of old index sti->index_entries = NULL; @@ -4225,11 +4225,11 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) } // Update the index ranges array - if (current_index_range < msc->index_ranges || index != current_index_range->end) { - current_index_range++; - current_index_range->start = index; + if (next_index_range == msc->index_ranges || index != next_index_range[-1].end) { + next_index_range->start = index; + next_index_range++; } - current_index_range->end = index + 1; + next_index_range[-1].end = index + 1; // Only start incrementing DTS in frame_duration amounts, when we encounter a frame in edit list. if (edit_list_start_encountered > 0) { @@ -4289,9 +4289,8 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) av_freep(&frame_duration_buffer); // Null terminate the index ranges array - current_index_range++; - current_index_range->start = 0; - current_index_range->end = 0; + next_index_range->start = 0; + next_index_range->end = 0; msc->current_index = msc->index_ranges[0].start; }