From patchwork Mon Sep 4 11:27:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43517 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1137652pzb; Mon, 4 Sep 2023 04:30:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG9CgZYT8AVoNl3aAh1iqsbBVJ6CIrFdRC862fUzWYIZ/O8KVR7qEo6OLTEzl3k7Bk/RVgC X-Received: by 2002:aa7:d6d5:0:b0:523:3e77:7eb5 with SMTP id x21-20020aa7d6d5000000b005233e777eb5mr6709957edr.2.1693827005761; Mon, 04 Sep 2023 04:30:05 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i24-20020a0564020f1800b0052e1a3a540esi1737985eda.229.2023.09.04.04.29.42; Mon, 04 Sep 2023 04:30:05 -0700 (PDT) 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=JWP5Xmww; 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 6DDB968C799; Mon, 4 Sep 2023 14:29:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2050.outbound.protection.outlook.com [40.92.73.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D580D68C07A for ; Mon, 4 Sep 2023 14:29:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fcPX4jazIAz3ZovKXK19sNpAHHbFy/KsGKcVKfBmXrntu3KdW+lC4TPAtpAQdHKIfj4a04XhP1SCk7bLE1ysS43ZZaLsGLJRK7lMwS5ysxlO7iIyqOXgdAcuFY7me9WwhRknA5qVzHRSFW/u+gPVjSc4ydn0HHs9/TUYmlj+7AFs7rsifjjs03WGdn3kQWbAc6s+g58lKZ4U7xJFDqwjvdBbrKhVSDLEHQm+iXARaBib5G7BtQtKzbFxtMfyZyZZt/2/XQNWDQyTL8bHNhQJVQdv48nJCSLaCcpqMoihM4BcozcCiLVLCJDFYhV9Taftb+XUSwOtjYrbuV6gIPBCOQ== 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=2iE1tOhcDbfZ8cp/WAf4B0al07IVV4RdjxPM0eZ3HTw=; b=ebg87tLY6DtBxt2alj00L1pFQZtwpw/heyggUprSlGzsEfmlZDiLtzQtQxaNU03MrdEQkH4TnuVcR2n8XfPGOrGjUtJdfFziTaxbrafnhTlmgUNyL/S6PAk5vVHS43Cjvh5Knc9bFyq3T/X5O9ask8OEbMFxYs8UBjB+XvJn6FlbrK8EsZU+R+734RQ1h6SfLBe7A+ZsewLVUwBLya6bMEctS8iRd1d+c9Xt9mBwGkfLZKcB68/DEStDEniTKpce+fM3UVEeM9N1RF/zTLd6ZlGR+M0bdndZQuBunbzFVFbnxgrnWOhRT68Od3+hhfKI3SpSiLuxAB+EiKbi7Weq+Q== 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=2iE1tOhcDbfZ8cp/WAf4B0al07IVV4RdjxPM0eZ3HTw=; b=JWP5XmwwZo493ZtJd5uls5IUVaZQ9w3DSWvtbRTekAcToYJcalbnUQ3MxrwHDJ2nI3VE7VVuXyYuo04CvHdsVYdq0r7VWFDiciyRi9k+5RV+TuX+c1zcsphgPHH+XemcoDMpdMisZkx7yHmx72tNnGLpJDd+6rRLHWtLDgJFMc+9A3LU05bfxH4qm1CmNk2Xw3xypDXO1qdQKjdQSGRGF7yseSyCiHNmN1BjiqSCQxogo6VDMjGOYezvvvjiIOBRokZLFD4FqzjIDu4AaqMoOI+Hxy/JGmAY+o3yENYIReY+nfQJzt5kVfmstom+8fTt4y9Y8PKXa365rwSnRbKQ7Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0280.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 11:29:32 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 11:29:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [h74L3IfLQD9V0YGYtTEdeLGI4Enq149UsVN01CdD8H4=] X-ClientProxiedBy: ZR2P278CA0078.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904112759.2652347-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0280:EE_ X-MS-Office365-Filtering-Correlation-Id: 9fe2151f-00a2-4125-a63d-08dbad3a3553 X-MS-Exchange-SLBlob-MailProps: mWtqiNqNgRsvP1IyuUnIA2ny4MUTgERxZC87R3Y2+kVaXNoCZ1iWJIPah2y4Ztd73WqIJlCkSKrvgDJ1T54rZ0yf8NB8ju5XuWkHarInG7xx5gdbOyeAuJZZBeNo3/j+3wZEBu7rt/zabnwJ01l5VWMPkxk8akGASgrluvA9RVBDLD+h+KOjXUQf9Ad2Yry4rRyc8dsj6euc29msXK2E9PZyYcJ/E8Cyog4uDNggITL8tNRDe86eshT+WGxcidW2b2J/u9HeMeoobQQj1twndYsaTEzE+KJWuh1cEhqUtmcHDvq0Fb1CW5O7BYukoDI9ueAgW9Z8dLgFodr0wcAIIwY12nD7fyjt5R0xqvRdn1aWbjA191J4LrQGOtgWIaOcUL91wK1SeojC5GvVDMb6zyhV/ABd8/UAMusF6RilHfdxmaep6uGoQLF+MmlGlg9+16tel3lkA5uRqkyIdeAqven40l3bZNPm20nHpqQdSG9F+rcLHwdmKLSDSJTOsZZYivDMA2Eq/vz4T2QwilqDc1s0nNN5exOdLELasDyXgWDU2QcT43z1ymmsI0DFGN8es4bO110/obGw4uN804F1aqZ1BitrKbJ530lHARAOmhTXRyW1y98rmTseNJtiD0LNcbWdeQDiLn5Mb+kfI2FyuiCwFmBNm7Q0e38YCcQkt4tWbzZlpcklGJ2l55Pee/lxxOQ32NqELF+uwNzniT4t3gpRliAFHh5TVGGt0N/78dIK4xKD3Y3yMSTqBXfLGyoa43cIxpjiZOvRYfNom0tLiPQduYuj1M3GrhhR5JwYd9w= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YgGBn3WEksVQKmv7C0Pk7iQuz4tB4xRWS/VGdTptfjCIy8J5MGHHX4rzF7+BkEWkIWWg047YcvOZLNzfx9YG00srV+22D4iWUSvR77hBuYt3QwgayHamNaRjfXHVaOekNfSUDFT+ytqEVntxoswYiAgFQjwQnNQqJvT4W5mSG2YKKUhIhdNj7ABBi6m9uflLnZwrg27DBjuATUgSjsDGn/XaxmDcsmCwHBu07OyfpStmW/0AMNZYlfwy5DzwGsWNWYMe2cYK0Mfjp57MA6FmOIqWuT4+fmT1ZVlcvqXLnplvs8u1gvKKWOMYVQnX+upEzQo2+MN99LM6Keqndi/BBfXf1YEomQio59Be47I5rLGqBvdYkEZyoAtKFe0gtQZFfQX5JA8honI27eHzK41+wnFdWRmNJE+sRk3JD49WpbBi2f2WyumZpG+Ly7TKJpK7i5SLRID/L+n+4Pkvwph6umFTR3AWtQpPgXs6aofsijRVH3CaTeOtmXACrxl6ERky5ys0AXf0yILM4w4I7p8bbUP9eoL0WR3q9fPjh+/6L2smKmEYMT7FbReVza1r5HEpqpCyPSES/dOQVWOI2NG9vHRy+5+DEQgYL8OQTAvCuu/Swlio8EwLNvlZgWdDUIgG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: is+CJyA41M21lmAKSlWzRcO39STMB5NF+Z8jfbuJo90J0Tp+UeJ3EZ8ETMA8I2832xJmBOsiItcuFb8IZPh0Hm9XWRlbZw/EO8IvuLWHpwpDGy0taApzC/eMH+5adKCiKvZHIfGuejvW17ItNWaS22lfhpfkEycen6XTkwkhvHAw9B/cs6sxoHZbiJIYpStcdIj1PuP2XiLSfEd+Y7Y6nEzM2+VcdGcXn9+hqevX8+MTNzeCRWM7xP/phjntXpFAPS4ZaIvfHAs21gqFkfr3lpvcEHErPtn9wuU5xKlH4yhiS2XKF1LoGFkAJ5Xep9Bm0ijIXsjvA1tDIK8eNo2B7dv/SOWqExhi2YLX8R0ovTGxMJ8GFKj8FmfEb9y2RRof7VgOQJeNxAd3dgDF13H5USpcgR0mK1b3R466rwiW/TWX+QS3C+m+/3dSw1DivPTh/VZchU5QgFM8p1I5Mt15ZfuwDdrUXXaGDopL0jJDj7vI7jHeaQ2xhh1dAWRt5Gqeo1JAuWjgmlemkshnC0hwUlPOQElTUcWpUIWu0PJuMrDh18bia4T/9o5OfrqoC1l9ivKpngFnVBAKyJS5v4gLMSwBqY/iqu9HSxzC0E47xa85unIKlRYQV70j/FJ45g3PFSzOvPmIhdqujCjRAwdQ5qt1am4LC4zr6w1wR5rf/H3HaCmun/Lu/tEpVOkwN6jiDeLXWpcrLGxmJzAvAji5N0skqfnTBilBC8fR1ece/PwTUvkQjOE5ocyU6LJi21GqFnhtLUE9serAc+zgxAl8dtZZ5QK/JSYc/svAL84gBvJUW0G/UfpT33I2opJfVI+NvnZM668vqPVpORNvTv5NZC5ROrk6PxQofp8xBou54r1DjFzC8rKkXWEYXRk9sQSqmjU3Lmfw8MmCi8psW7SxMTGXtEbsX4Pk705UHkJtlkDBaR3LvyX+FcN/K6k7ZK5zu33h7wesmMrIPazNbUiQ7DfNZ9sUJGVoPyLlFYkO631MFNUfbaE7HN4XrPUAHdllORtoQoayXMdLZ4luWLRAqS4NXbKccG/I1fQcxePSJyoQIsia9WVDyM18xBnn3uL8F5cmHEt0nTD87HChu0KtTKIqBwITJrXjRIkW+a646RfC1FXA4SeaXLUVuDqi1jvZdo+eCHGG6Qmlcq0YZ/ITxZJuROdpIZ4Pe1+Yz6sA2Ih/72vpuwj/ELvWaOuzpUys16KauVbp0jwz4haIzE0u5Ymh5DCthcS6325ErYGuY0T1wZmCck7ifVMKVtLx4bQ2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fe2151f-00a2-4125-a63d-08dbad3a3553 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 11:29:31.9887 (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: AM8P250MB0280 Subject: [FFmpeg-devel] [PATCH 12/20] avformat/matroskadec: Avoid clobbering CodecPrivate size 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: qWHSe1DWH1mB Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 21a0a1ecd5..147a146873 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3036,15 +3036,14 @@ static int matroska_parse_tracks(AVFormatContext *s) track->codec_priv.size = 0; } - track->codec_priv.size -= extradata_offset; if (par->codec_id == AV_CODEC_ID_NONE) av_log(matroska->ctx, AV_LOG_INFO, "Unknown/unsupported AVCodecID %s.\n", track->codec_id); - if (!par->extradata && track->codec_priv.size > 0) { + if (!par->extradata && track->codec_priv.size > extradata_offset) { const uint8_t *src = track->codec_priv.data + extradata_offset; - unsigned extra_size = track->codec_priv.size; + unsigned extra_size = track->codec_priv.size - extradata_offset; ret = ff_alloc_extradata(par, extra_size); if (ret < 0) return ret;