From patchwork Tue Sep 12 12:34:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43715 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2751236pzb; Tue, 12 Sep 2023 05:33:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEyovd1PyYfX2+JH2HYzTLNEra3XDwurumasdnDjRllmpQYyWJ04XH3gGmFCK+XBTdqLLK2 X-Received: by 2002:aa7:ce0d:0:b0:525:44c5:48e2 with SMTP id d13-20020aa7ce0d000000b0052544c548e2mr10710548edv.22.1694522035647; Tue, 12 Sep 2023 05:33:55 -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 s17-20020aa7c551000000b005234cf575fcsi8373424edr.285.2023.09.12.05.33.55; Tue, 12 Sep 2023 05:33:55 -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="slD6z6p/"; 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 39FB468C9B2; Tue, 12 Sep 2023 15:33:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2043.outbound.protection.outlook.com [40.92.89.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E57B68C98B for ; Tue, 12 Sep 2023 15:33:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KkzTfX45E1LCsOLy9Xf9G+OqayfFdwvelFoHMcHTjO2eYnPNWD5kHunDxrt/hF1CvuWbFobFAtQMwf7oET1ERp8NE9iik+1cHOT71uIY7ZE7n85H9wo5lC+D+3nQkw9+MtoKYiPnHThtSfpd4uAVkDvPzYXDnwRbLYjrfN4QW9tp8byeVjXz6Unbkb6/H7Pt4B6JqdI96NOb53reu0DKit06msBtqu+cWWP5wRwrKED1ERh+m9LUchZPFJZyaWdFcEXcYjYziQeovcc4oqduboo5gFr04glMG07rEIjpqEj9XGb0oTtQvhHQk15fUYFHBbdDpkOrb4xQGOvm2UEI8g== 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=R0sXZCf6DsfkKr95dLpP5FQ4PA4QsnTI3pt4jRx5ySc=; b=OUPQItdxb4Y4DCpwBBw8CZGL9kv3mU/+WXER35RyQHZirc14plkMLwC2qpT3Oj/LIygsNzlKFuCVeGwnwJGzt9wr7ukToHb1IAbGOIa4041+sO/aI1T6XlQjj59UGex4lRVCASxtuEsG4/9RIG8LWp0TlryxBciTaBB9lE51YnwNDcn1R7Npv03zFyKxKLFbw374ooxbvRowgx4HTfaqXKH6Ikua8DmMFTvbmXzD5fnc1lt0sFlhgiq8W6yt14W1MDzpXxRvrmE1vtMG1mCZ/oa8NtbJhpt3eoTbELbJBLIUHzjqITEtk9Gs1g+hvDoU/Lfw6moSz18BJcX/aBLCCw== 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=R0sXZCf6DsfkKr95dLpP5FQ4PA4QsnTI3pt4jRx5ySc=; b=slD6z6p/VS8uTX8786Y0Mcgy2k/36oDUM/wU0YQzqEQTUzXlU6naFUpdGJdfgDxBYpzLq2MDZLv9thNui1JgMy/7NJAUB8TgaFggFiasuv3HeUcxqFtU5+cFGniacpQQOi9Q8bB+CGWgi29ycsnwYS55PJY0gfhj7vq+TKIFN0u9tq8+cZLwdeWBz7q3Itqluz01rEw/4/w7VRpFw8Vj5LdXHeUycd9WdOssBUTCHjijD4llY86UINlh8HqbDoRbr17RjSSvMb4WAeRHEm9gAD8vx5iAZRliLCrBr4QL3SmmCa6sidkCyfmSniGIMnmLPoGso9wyTnDtnciDWCTtKA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0294.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Tue, 12 Sep 2023 12:33:48 +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.6768.029; Tue, 12 Sep 2023 12:33:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2023 14:34:18 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [RWT7tUM7cyzvos3P+TGdXvuqLwB5jZAk] X-ClientProxiedBy: ZR2P278CA0051.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230912123419.2065863-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0294:EE_ X-MS-Office365-Filtering-Correlation-Id: 5773ba9b-9244-4c19-177e-08dbb38c836a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5RBMkOA/BVjAIP1Cg1BOpYKdumbLKIZL3YmS9gKMx0IIbZW1mwpRuK0jmgADyP9FoF1cwYbu6U/KIts0Hlu2H+wnxA1xV8vWDUKUGav3OjWzJNTY6mYZP+9K4cwNF7TUyZLYRuOExznftb10VkSllzal0O/+RkwvK89TOBFXL+ZpYJCgyUCow1UR+Yt4M3hOjwlEDo2lDPiqjBPTSaZQ3rkDSKgCZtGdg1cg8sfCd6c3YMxxv947VbuY2oJfGWbqMwTWX37O2ZH3UDe5ZPzcZ7tABohhh1C8BVCnHwy0E1K1fDK/QIRFNldxDZxwhpk+4iweOeKf+vFdN9iRmnRNYIZ3RaXVJmlLhyYQa0CfLcQ235+ZZpQeGe/6dbO2/R4NsnlBWCvTyWq8Dwwsf8xOOxNGTM8F2ama09u6yuk3jesQ5MlMn17yVA0j1yqqSlp/G3+xZIkenZQWOHuCeZYABv/3sQ9OVvT3Txhxru6Qe/WoLcAlaHWK1N33huk/zEFAKfjfPdgxhr4EYJRUxxAo2hFsGUOAZBqkp3vCjaRQb9U5MmImelCtWkDIE5fuuxy/ma5H4HypeYBE24OuBSGmyNkZejcOWuRWLQVa/MNUKWNmKHJGuGNoALF+gwCqMqa4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i6SB+8DPUwx7cr5mZhKz8pTPpN/WJOIA3Bgg/VrJHwZpQwBcGNvxC7Rh5YhjJnvIN9zq38cKQ21Gx56Gc8NhPqe57LcyKMY/5AsE5SrPQI778GamQhtIkKnjfxfQo7sQz49PIb0p2Om+Tf9xUYZuc+lxoE8GiARqDT0Qax5w2R4/jhCIMC0C6r95bH13BrJNLdyILu03/UqMsdZwSnyJh/eBheQnEeGK8bkM/8gDrbKivPUHJIxBGTludjbDpfwS9O90hpYE/N3T9x2aeIaz+8g10UYMw0xoDzcCY5ApLnvwGql8p3SmM/hwdtAHBz3DMLIPqBzWruqqnj+fY8RpcMwAJ11pLSl/sT1omOimx23DRFlO11eHKCrFQgC4lbuk3dpGV0F0cOAFLBDFjNB1ywmEUtaYmyuLhzHBBH59Dx+uQM2VfGr3XORm7UBWmCZ/r2EHkwW/G+qsYSDDZojBftd4on/91hmni2jY+WTtmA2G15cmzOkzn9Q86xYblGKzMyMT93p/9YG9Pt6TeAznmzEy4JmJL8O/12+NUcYjo3a3NtISMN43ttPaXOCWq/ayhh0Kx82FIKhmOWOLt/6wjV716K/UdX3+mAFRhIk7SRSjBZ76cwjcX17l1ooENiQdtA1XTPmlxukIAPf2TnJPto/KtuWhPINOK9fOP0Nt7l4rsg198g9iMGvlYyoMD714RHNSX85mNZ/jzsysy3venqmaGlh4cNawRu/G7g3oVqGSEyAOtFH7k1U3D+uPSSSwtOlbHSbDwyJEocyYCPtgudjvR0KaMTYCzVBGiTOoDrlHxX8gj9skugb2VEIzLKq37HUayTorkfFPPJMSGox9J12bXxukejgoDzaExKIhuzoHT3iVnlQtoVC23rNapWdCF4IDyXwPQK16Z7wLbwK3ZF0hfGZJVNYh0d83+VUnJmEx8Dyl4wQDNEjrB3YiaVHp+oQx9FYq6oVwvg/mgYT4vMIYFCsvabNcYJe6etqYf+qD4BXI3jKZZ5N8vgy29GLQvxtnIW92FbrcTPRBTcouyEuKeyUF0xTHaeg4kJrfLvI9cuw4FvDi2aoppf5COJWuvbt/SAQEoGIiLJTEUZ2a7G+WaRjj6atPkMmyCaHcL+EOUfy29p2YWJ5m/aY9PDR9l7pU0R2AFOjlY0PjxbYm6QFk17bMZiemkf4ny0x4yVnpthdis/2URK7SZNfXus1PxIqiPPJXYKny9GEDdsE4A8RVsoJogx43PywA0WSRMzVSVHw2tKvW+PGtKcFlZ7O2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5773ba9b-9244-4c19-177e-08dbb38c836a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2023 12:33:48.7195 (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: AM8P250MB0294 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/wtvdec: Use smaller upper bound for 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: l+IrStfF6rrd Every code point in the BMP is representable with at most three bytes in UTF-8 and every code point not in the BMP takes four bytes. For each of the latter, the encoding of UTF-16 takes as many bytes; for each of the former, it takes at most 3/2 as many. Therefore one can decrease the size of the buffer allocated here. Signed-off-by: Andreas Rheinhardt --- libavformat/wtvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 4ce4b6403e..9fe00590c8 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -468,7 +468,7 @@ static void get_tag(AVFormatContext *s, AVIOContext *pb, const char *key, int ty return; } - buf_size = FFMIN(FFMAX(2U * length, LEN_PRETTY_GUID) + 1, INT_MAX); + buf_size = FFMIN(FFMAX(length + length / 2U, LEN_PRETTY_GUID) + 1, INT_MAX); buf = av_malloc(buf_size); if (!buf) return;