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;