From patchwork Sun Jan 16 22:49:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33612 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2264213iog; Sun, 16 Jan 2022 14:49:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxEK5Wi9Odzldp6ADZBWZZOFPdKHtS9Uee+yfRj/NSkGMLlapiTqVyUHjdjE6quYZ7Mb/sT X-Received: by 2002:a05:6402:1d84:: with SMTP id dk4mr13856134edb.209.1642373389513; Sun, 16 Jan 2022 14:49:49 -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 ho13si6234946ejc.994.2022.01.16.14.49.48; Sun, 16 Jan 2022 14:49:49 -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=FEuTGUjb; 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 989EB68AE51; Mon, 17 Jan 2022 00:49:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068107.outbound.protection.outlook.com [40.92.68.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 537D3688081 for ; Mon, 17 Jan 2022 00:49:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ehV2XcZlTtquytLiZNs7DQ6JDF8dse6vn2rrOYBtqP3VoTMPj90AcpkP7m4a8cyU6tIqBCezRErk0VsUwedZx9YFPmtLDuLt1VdBI3dONCnfhAzYLTxgFOhLgA/8ggtdk0ghsLSTrbqAh+rnEPF9erh/XTSNPtEEtR81r9zcxaOSLjArOAcMCcBcfok73dnoeCUngqJjIk3Y26HNSgmIs+uHWZDXJkg2Ob1Am9fRrSnCRWkFs75lgNFg0kcmm2r/cs6rfmZXzIgDMWWNHOVVuZsWKDtu4UrIgGRY8n4aCmkTR7er01dfjuAbV5tYeuNAQXlKpWcTDKBlyApkKz30Mg== 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=1edlTi+/lV9M6bUwbjUntsmZJqHuTcJgmMTYqwhJrFE=; b=M22J1VnOH3CNzq9Ni17owzIfRZNcO9JUmceDVV7nZ+juxy4YPrk+NbPdg4X9g2DaKuArqIZTmCMe8+86XDfHbhUeGF+XlZzc1Y8mV8r5/j9w5QsNHYjDSsqDNhRdjK1rXgdO11lizm0QOQ2nTQ5ri4MyX3fSNIBHvEGnzCWlbR3R/e0O56zmnJKB5aPzF3MTREBsUntIf30NKJHq+smB5d8zTgvJ5Fz/X7jtEwARQ6b0AR6nIigT4DF6jr9QQB0Y8MvJzAdU2c02lQralk3At+MJCIfSixCugdmIdi2QwpkmCzvpCBCMo3DlY5isi/TBBpG5zRlRoYj6vh8LX8489A== 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=1edlTi+/lV9M6bUwbjUntsmZJqHuTcJgmMTYqwhJrFE=; b=FEuTGUjbjL6XK574sxE+Fv2AyGc91AfAhEr3pQKXVgJJKN1E5wr38pGp78pohwm9Gs3BRxeAss/OPlUGq71fAlQ+bszYMvtPvScY4BYtBcNEcoZ2SRz25c/FW+l/AN9rklMZACHYON/cPIxS+epvBDlN8AEZmjAemZarIEeR61zG/L6qTXCHaMMdoveNXh1KLQaUbQIlBzaXjZRYN7ZiSwxH5V6WFOqulSuQg3+w27LPE/FoKvASrT3qhPGbxvt+Oj8E4nwzHm17x5/Rq5XtQB/WyeVIcNeCluho+2jJWwt5aLsgcVpsEvcAOZsIU6bt0DCM9tFjiBhD5d/w6NeJ6Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB4834.eurprd03.prod.outlook.com (2603:10a6:208:101::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sun, 16 Jan 2022 22:49:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 22:49:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jan 2022 23:49:02 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [aqVtWmEd2Hou+9ouMU5bkvExvgf0aMj/] X-ClientProxiedBy: AM0PR07CA0017.eurprd07.prod.outlook.com (2603:10a6:208:ac::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220116224926.194061-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4c3e7df-542a-4573-d50e-08d9d942783a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQajRkhOqduPnsb2ky7RIoN4rHf4RDm5HycS3No7+/6hpsMojsTOEOm5S/PiGZBPVSTKubELyS/DKAZ/lg0EoQ91x0h9tph3yvBb9s5MO0aXhIcK59WCUCng7r+toVZ+4YdxlB+AyF1qzp85EYmHI5uE4XLSIwPa9S2B99Bv9tfiSZ/8GhLYOuKJWrTA8NtjY75ab2twcnuG7Jpgzipcd0gt/Y6n1EToCw5u3NNrFPj/IZJ5uKHd+KnNw61bdv1TG0akeBD4FoQ4z9qZHE4GxAHU13PdOqUk4V9UtPQV0/u2/AA3wJxHaNV4eFjYH9wMe1ytSfrRTb8D2dnuZNFyo/EHmLtwVwK3UAUVnvmxspEUPoYzQtiGa2vk9JsO2WQDn5077J74CHBVtgHqWk92+k2v0cDpi41sda5t51VIj/riW/TlCDnC83ZJaOUAXPXLRccnkXANupBICMcfVzrVmyncgk2hfAPpg2pNijRQkZicc1xj17Kv/SOppAmEBdZn4amtbgOqQjDdPnB05PRxhRCAEJec1Bu92CaS0v2njsrXiVLErPtbzS39/I1+Hi2RiRZLGlX5b0ByvdrGpzLjW2dcinVLYPMMB73xEHVEtqkj3OYf2POZNed/j9Ck2b8UfErlfaG2Ba+qcci23obAhS/y2bgGnPPWneZNXjI6WyF8eL4E0x5EA3aII6TIKX7dyY0oBKUdmwxhWouTlrdy8rmOl9lYliKzdEsZfXnUeQldMj3yraYK5mhUw= X-MS-TrafficTypeDiagnostic: AM0PR03MB4834:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hrpuHAzAItZGn/N3G27q/apnsJRym0AwEDTa3WlgR7knyZfM+Cm7o9u1mlXZKm5NgBtGArpE9woPHiZBOD1Y40zNWNthJBnqTFG2k5zuBl3BEQ64kNiYpcMQwlFOg5saccKN5ehShX+Ykw37oBlH+QUwNN7ZON6Sdqskuu9SqiqM3MUb82FNId2mKkchvai44sSC4p7VwVA2J5CxkDntJ1El6oaZLUOz1KoDJtiAwmay5jnvhbV59l6rJcHQPdnV8tvPSair/lSXRAjgzuiR6ERArQpNfLaqpYpEEhVKne3AAeF3GC8tpydEPAIlPKEkwNlLCD37rxLQfCTk5pqIFIcieY1mUqKAKAb41ff6BvDnuLAzj+5alat0VRDcG7KowPH6C+6Fj8Em8N+xSNq5rvF8C1lOenk6t7DBcDWhOMDg27O1ERzHK7K591YjgoPbbbAoJSf7aWrYFipBhqTtgV7h+YIudCVHsULNhwPA5TiSFfWi4vwR/Qvd1gZRKy+bhsFzNeqJIL154PkystQfooDJ3+qsvPjjmfXPtZg24og7+BGacoepH5RrpE0AfikbB8ZereBLTPtYvyXxopc3Ug== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M0s09VESdYd2/CSCukdXUKivXs+/X4FRiSjViKgViHGBuRZEb0gBftJfQsZgqMoG7EXCCs7hJelBnUkoX+Clk8tHKOErMceMvUNN/2e5lQd3zmnOWnltBgaKG1AoZx7X5FgkbENqP9guSAu6sinEEDfhtQCajlR2bq/9AxcKHO93YG6rRCmkEX1zqkPadidYXSTbdu0uYMZfZejWrb4tnyan2S+wzqKCZp/fQ0ghVNCtr/n1nRTh6KzX8FWFNOBm+i5i+qN+fD0yB4Tby4RCs+AaaGAj1rSB0Qmwi//rt8CcuYuDacpzHDULKNcusLA47tE4UCXmD31fXIAouZYzrR9tX/6oA7LUkkbq10kp1Yfc59oJt3rtyUrFDCEyJ8ouJPBFBNImYue6/BfrODGIQAIsCzh92NZzrKi/n7O1Zdp6CFWjlPE9p3ge+HgqPuJjZ6CsRKybnJAI+CedIzhMU5DB9mr/WrkeAtRQGNVyW63gJkxlyLdW/Y8vIJdc3Sr2kUNvfHiB9HA1DXsZuglNzkR412lHddhkrrEwmqYTbqoCe0rDMqVlIMWOg9W3Z3T+WZVfGn3q2a+YCxyaA7G/V2KIarQzLyEZ2wONZrY6Y+NjlgzN8dbwwLDUwZ+/tyP+6M3v+AergFqLA5GPDRXwVe3ABr3Jxbd5+FueWeQwqze5F8GQkCkrQ9gbn7i4RfGKGiflK7OvDDQzku6uXJJhatyi/jmAVf6TFbIHiwyv+J1w7rqWEhwgTi8lhJySDl5nL0BRe4FHcgAIbyuie57U1xkog7dHNlE6aol/OksZw0KTcqmDB/e5DRirErbq9UAVltbFjCKchFSHhVXGVzr0LXvC8aujs3Ap3Qp+KAuy2AoBYUrPt3S/6+hikyIL/+t8UFEd1XYUGqfEVOLvtd4T2fopLpVdkvQq36YV1CSSgI2ZppGp03shSsl/zsAiSU9NQLLsVSu/v217XXePmYZQVA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4c3e7df-542a-4573-d50e-08d9d942783a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 22:49:36.1576 (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: AM0PR03MB4834 Subject: [FFmpeg-devel] [PATCH 01/25] avformat/matroskaenc: Fix potential overflow 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: sglK6a1Jqcu+ Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 41b2df7dbf..1dde12a7d9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -286,7 +286,7 @@ static void put_ebml_uint(AVIOContext *pb, uint32_t elementid, uint64_t val) static void put_ebml_sint(AVIOContext *pb, uint32_t elementid, int64_t val) { int i, bytes = 1; - uint64_t tmp = 2*(val < 0 ? val^-1 : val); + uint64_t tmp = 2 * (uint64_t)(val < 0 ? val^-1 : val); while (tmp >>= 8) bytes++;