From patchwork Tue Sep 12 12:27:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43712 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2746799pzb; Tue, 12 Sep 2023 05:26:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGyr0ZmEJCEgzh6GlUlC+5HQpqnURNufKNVd4/0by5Pmk1HUEbtvwXC6haJ1PeLOYv1vBf1 X-Received: by 2002:a17:906:10cf:b0:9a9:e41c:bcb3 with SMTP id v15-20020a17090610cf00b009a9e41cbcb3mr10224045ejv.59.1694521582396; Tue, 12 Sep 2023 05:26:22 -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 us11-20020a170906bfcb00b0098d7390816asi9071235ejb.756.2023.09.12.05.26.21; Tue, 12 Sep 2023 05:26:22 -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=fXX6LpXQ; 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 A365868C980; Tue, 12 Sep 2023 15:26:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2062.outbound.protection.outlook.com [40.92.59.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C5B668C76E for ; Tue, 12 Sep 2023 15:26:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C4QQ+8AjVczDtSXnHd4rH00qDrc4qnq4AuTI9ju3Lcvouf2fFTqMabl+MUFbK0am3YXFm97a1bbOXv48OPp7SmfMHO2N/PztH8w3SWf7g7MwsIPdk8B7pU8KjQ9Jl2iZUeK/JswwNx01UkdK/Jonklnm1YXQ+TmYQ000jwg96/VJqe+NAu+xYhO5EsugAAE0VsoNBGJg6t60toS37nwMjLWzrt9LkX3S6xBnGWOAmQTo0q7zFP5sm/2fYo0jKL00lKyfMHXb0TWwdyrkHe1MS1nMmglUaLEWD4zIAzTRQ+O0a4i/oy5uUW/hnMyptdK7EPCOFmNUTLeYExlFhR66IQ== 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=bJTLgKChb8ZxRPVwELqV0/1EvN7xAAFef2AH3MS1bOU=; b=HT3DjY2kx7hO1p73cvuF5jXet7kMlu5A/KrcTkO73/YPDm+y4WqwUtjwaO95mDmI94F6GCdYUnVV8IFbYZEmje4uf/Jtybp+nRNUYdZDfti34Xz/jZlf4ImK5ZY1n7B4y/2MrAs3THR1FQO+Wsr6IdvxcQH5DLB+zPzMiiGF8YvmtDca5Jund+PpEWkSF6fyLZsNMhyZjFyPvS4laWL9Fyk2yDeuilhoWTUvLw3f1jaN36PwOnRzPRpOPM8C2MyalAkE7D2KKiogxdmE/dnUpxx1TtXvWAJUBzjelEXmDtvcQSOCWndoGFmPys2R7osYUoyC4W/th0yySoD4x/9ouA== 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=bJTLgKChb8ZxRPVwELqV0/1EvN7xAAFef2AH3MS1bOU=; b=fXX6LpXQfQ4D1FwsGxq+jir0EopHRvpGTNVvZWrz43l9WwXph5GXenzJqnFvjyJVs79bzx/frl+i+EqekhfiHRZ9R064RTZ+ODm/OwMB6YvkuO3QIY87fLUpx2ZXrc4dV7epc+Yd7NF0bD/7BK3aMeAKGAc485u441OpiWHcPBBt7qGG4Ah6O4qIpkQSzo7Hs1fPD5ewlnvGm1i2ycgaGHbeY4UaSp7sksC1MmbX1XidBcKrZg5wfpkjCHwJKPZ00Qia4dtvuisduGBVsIkmuUS9S4QcGFWAdMS5kbL/2km/dKJ0JcrzWWtmqv+A6Qr3pWCBQh0revPlOCAJYPQmyg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0166.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:375::15) 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:26:09 +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:26:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2023 14:27:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [k/GTtuw+4/uVqvyLamCicomp9abyu7Q8] X-ClientProxiedBy: ZR0P278CA0092.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230912122721.2065483-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0166:EE_ X-MS-Office365-Filtering-Correlation-Id: 47913b8e-b311-4987-1ac5-08dbb38b715e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3Cayy7bh/5TIU9W1HgwAByvR+Bt8XzHq9Jbj7JSDo0Sgdf4N5aBYjBE9CIwqbiGoAtAgBXYQgtOex6YOmxqDpi9KtYNiju3W58jxamBSwBJCqO+aCUmZ0pfhuONZO4eNpzueNZo42C0m1nP5uqO4j6WEeNYK2mOQ0p0ZEWM63FJD4pNbImEKvaMvecS8eOeAD3N1vkTGzX1KvatBPOdJZ5gWEJNX8tc2AcWbcjT2vj95hqXFUxDGkMvwup2eU7ApSqg/HUaASTqDhdPlwQHpC4P+0vya28+zv9dQLNjAQeEuVX6ABWCvOb5S6zkFIr0Uiv6j+HYN9tOD1hwwmOvLZ52K+7X4CHYRcU8m035AFTN8G2X7KezK8oFa/8/rQJbSkTXn8Z72qOqpHfU30om2n/sJig9w4dZQKKs5453cFGlqp95dzgNDhCAhCMhcOTc8rmx/A4BFHkAzrSsX7q5fqPD18qogtCFfuZEeBKzY1OaBRS3d0RrjqOEdC3BLccldgbcmf2HUJ3DI1Mzv3pgaR8XpInbypEYekyBkg+RsaYbMTOoYW9RiX+oqoQYaHv0+bQwRZLakQ5XXRdotFsBIMhBrywm5hoOdxWsCXXl2jzw= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zSkCPbkhYUltiww/ivT3IJGRaHKMXh7bce5pvhdWHSkv3mS9Y0ZIq23BBbSGKJ5sXExoSXTkfvmfYNpO8Viui066Ddwg+iNLYZbzxRPoo7ogsB3veqnw5yHvjfCjd9a+OmLXhfM/wHiah26Vzx0CRv1UrN2JbeUmUu/ix9mSRTTO5nw1KOoBE9YNVRI/3rIhz8hwZ1E6z1/ZpqtRrXoUgF5NSgnwnuuZNPd7ShlBa5aCu/BAVv5FknpgCeW+ugMwngtffKRqsRUJi1C91/WiLL9FtCZJxaHwcMmRqvcZCDTF9YUVXCQYZ35czdQgpulOWB14nswlSIOi5ySd8xtBL/lFVeswPuXKwMc/avuK6zlzPu6jInI+hmr3HMuzYJIwS6aEICoAmAhzg7exDf9J3QlhndsXML2JHIfWvWQB4l/I1AMOTa8H/guE6e8OMynD9Iho8tM7jp+ZnZVREC3518rvYdmmDZo1EoAGHw6/AXBqce/oZkcKLHCcrbvupuDsEM37Y/tyKnJfhWgyrJPcLH5HBdOf26ushIVIfZpWlLXo6EB8tUesYAacDaRPayLMMYsR2kHtz0chgAhIgfglzLhmB93lrOAevVD1w+kMW6JqZmGKoxBbs7GQG+WGVLhloZaHy/VW93nBezE++JmbOJJJEBOpVwhEkbhaQlT+wlC1O2/8bpqlDWw3pRVTzGrlJl8J0q7J/4F2gu2+E9MvOPLBy3+zcqEaEkrJlnjO6/TGE1JHp6R3b7RdlG0BJuaXKZwF7lp/qOZxv3GhZpigtIxzsX2kboOdnGvjLJa2SGA5bsxOOzEGJl8EPSgqBieoqTJ/glM71WgRCne489WBLAeCs2vaHzVpZbVMGFvKBxzGeuxUUJE22P8PpFCRmF8BfdIasdzjFRoyiVuqJzbkqJsTUYJ52NOWcjUjfsTt31olZXR2JPzyOVJi8tvPSKosKR9+Ucbf0NMU0FK2TpL6J93LYB/FQRZjtJ2ZPTtRcVl7HN6x0F65MPXe1kRsae8M1lBHOQS4/EuhRp7DhdDkB5Mev5QLhGKf1H0whQI+J5gDwLkg6Bj1UeFc1gCH6HBvs+UDHhMCIsm81K24wFkXVL5A0vj+264ACeKXa+GgITBjNhL1ysJU/pIaVrapZGdTOQHZTzkFbvdjb5sOTFDHcDFBXmH0m9bPeilU2I15UcNFOoUT6r5h9eEbCBVyHMKUinkqKjeJP/ZTCGGRzeYMNkp26wMmlS/hOhOmmYn/HofMPNZr8xAQkWjECYXCb3a2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47913b8e-b311-4987-1ac5-08dbb38b715e 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:26:09.0124 (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: AS8P250MB0166 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/wtvdec: Don't truncate GUIDs 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: kfzvOrkp9nh4 Each of the 16 bytes of a GUID is written as a two-character hex value and three hyphens, leading to a length of 35. GCC 13 emits a -Wformat-truncation= warning because of this. Signed-off-by: Andreas Rheinhardt --- Is there actually a reason this is using a different format than the one used by lavu/uuid.h? libavformat/wtvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index b29ea7a923..1103f5ba03 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -43,7 +43,7 @@ "%08"PRIx32"-%04"PRIx16"-%04"PRIx16"-%02x%02x%02x%02x%02x%02x%02x%02x" #define ARG_PRETTY_GUID(g) \ AV_RL32(g),AV_RL16(g+4),AV_RL16(g+6),g[8],g[9],g[10],g[11],g[12],g[13],g[14],g[15] -#define LEN_PRETTY_GUID 34 +#define LEN_PRETTY_GUID 35 /* * File system routines From patchwork Tue Sep 12 12:34:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2750894pzb; Tue, 12 Sep 2023 05:33:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmZCG+h4Y6pWUp7/VubBYHVUtJ6K6EhCSciwK61G0LZJOV/4BBh1TOw+ewQfD4aIlwNzDe X-Received: by 2002:a17:906:8a51:b0:9a5:d74a:8b0a with SMTP id gx17-20020a1709068a5100b009a5d74a8b0amr10448906ejc.12.1694522001828; Tue, 12 Sep 2023 05:33:21 -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 n3-20020a170906840300b009a1a248ae6fsi9035969ejx.876.2023.09.12.05.33.20; Tue, 12 Sep 2023 05:33:21 -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=FCWmizr6; 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 CE2C368C9A4; Tue, 12 Sep 2023 15:33:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2020.outbound.protection.outlook.com [40.92.65.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B21C968C99E for ; Tue, 12 Sep 2023 15:33:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gBb1jQCGnv3tt5ZE9OCOCJIL6+4qEyrbaetPGV1lT+Og0nCLp8qQa7OE/1FHFSy54jXhWD4ltWmMvrgplfg4QO3Fe/BrvgvpCTDLut5WlosR0zxyLIPCLRT4lHhM5GHQ3AEwJ6yWaRKW2VEdkvvN1G27vhJmScxc/HFbO/2KmprcwQqZK1O0o5MPBJ6Gnc9rBeJEFp5QqsFTAV41tSCa1dKCOyMtF8jiUU+oGl9ek9n1r3X0mwPuy7qTkuglUn7k80P2taqtfiFAT0RoNKgZ9LqyOokScejJkRwI/y5RhWBNnEJxrje0QQZwmX/Tqvshio1pyg1q4f9xl1zI/2Hpaw== 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=W+KQTk7geSqaN4PDAJbXYAAC3FXOSnyRec/B4fDw3YA=; b=huJNDPBRewZXLqWyM0jjFEhth03XY++IjYlcBCfEJOx/FO8PCsdV3E5IDTeuwhf8w/ktwd4KhozRAo7FxIjmB2F3qkp2r2rnannogHEdDDiAvGIUCK+8NdmkhV5rzVtsA6Ysjw2i3NveKM+t16sp+plcGx19tpSae562aPbL13xOQ0Gt7gIHS3PjLSiKaScvYULaCXpa79WrNed9fjshpIL2j8V0tL/OPJaGzUYT2UtURsAiu27FAhCcw4uKuNYFHS5zr68b+vcCsiXfZ8EyYd6vwN/kZCozRp+g7jRYaViF6GJgANPomhT5MO/Kym6SlryZVKPZn9NEEIxdSxQPqw== 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=W+KQTk7geSqaN4PDAJbXYAAC3FXOSnyRec/B4fDw3YA=; b=FCWmizr6+LKAKoG5j/fLSdC6jnXpjneNb9Q4SuW19m5/J6VFWf45Y5Dub5StaNLuEzNMGEO3+dTKZJ0xLe9BnoF7yy3mRGSqju+2MdTKo6TtxJG6oMskhLL16BBxgBo8DpD0Sn3HHKatg4JAVjon7GvBma9YE+ZZOU+3lf4Jxw6Op+rFgp5zGIH9ZXm3OV3+2xfDDTXcwnbONZU02nd5LBaKUIIXRXtUpcQFdtEPc/i+yE+NW6i1P8l7BqXBYPP2JBWN8Y+oFBqcx3lpYh9f8v1UIXbIwj0TRnlowvDDp9kgOhbwYeoL/04nMgSHN98GUhuKhvCLmZt7RVlV/93N0g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0252.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Tue, 12 Sep 2023 12:33:09 +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:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2023 14:34:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4EE9AU2lV+KksSmiF9MhmmoaSUqxocKQ] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0252:EE_ X-MS-Office365-Filtering-Correlation-Id: e1303dd4-0feb-452e-2bd3-08dbb38c6adc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PHjE8kRf5Poj3jlcddJqHKeIc+0MU+o0CZ9TUZdN03shbN3yrHBNf2/Q3AIU+bDl9hgRhj9cSFUiLDWXlmTVzwcFyBaIuZkLy1AjMg4w2/IRDiyAKY3LQiBt/y5qkgAICqOZJGAD2p/MtEsbtzAmLnRi/QlNFbvu1xz2IoAuY1J9K/2Q2iU6UAVgGW8VcCxihcY2KbTALqLAmkYPThOSxUzgOrUKGb751eBy4QJEinGn+k8vZlKLx9zotIbkpAdlYNgJtqfsmU1tG8UUZEMHt1Op/G2Nk1lAtFI9ZnfVBf02DuCyfSdMYfwKCSQslRAfWZ2qS7GXAT3HOqxRSDATGDWpiwUig0L6aryM0uaFmYRrQCvTWJ3pZSQtIsPNVvfrAsyHgsMqcP/mXjzCxx7aVVYBed0zt1+RgXwzV9b0OreKST1KIA9YSrfqUBi698mkLLXG23aIeDuuJ95dLI9LwCKmU9ELr2wfdnPHSVKvsbqr0fgEq3tPkz/S+LIP7I0zFx7oom+sgsVNj4CXUv2OV1lYHricS+eoyVryvajQ9yhtQvzSsKyDuQZARb0ncGM90ymWzVYUTiIjISlcvDkJjU7EGvd5MeqvVVXfQvDi4p1RtNZycNZNXSf6zWPlBxuu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uecOC80/CvEAQcqvD/I9McTQ3T27zlkz9DrjOfn4eGi06B97jMDlAlY3JgD6j7XnuQqIDGhXCvLQlIuKkYrk3TEOvhQFUD3uyoC2bj/P/ie5Mk/gbo9OZUsjwECcgXkfifVFci4ozwsHkfcq03Cg3qPVguyC8hK6wGvL7r0pCNU354R2S1UYjLZa3e2+F1YSvoSCBLO0CcQwaO8WlBCBL6ovygZ0hix9IwBxdSoYxhMibihOEL4ksYIJ3qvoVussW/9qEMx3rNgYLlim8BuFjZCgC+Ak5kCAJ5yuBrx30SM7k1CHwWWefZaafXoZX6Hk9/+TTp6+myZmNWGm3dS3+3DnSjSuVMt2ZDKb0t3fcEUSXaWb6Imtn7LexB64BDc+hSQ267kXjb2VJI4ELB5axOlPZM3ELGieUqadKs+90sMP+ZoKWSGqZNP4a60T8Ndx+1GpRBbh85VWbQSEELslxtOopymbHt+CoGFI5H3ofNmZpqWZMDXeZqhJ+7krVW7O/hIp9gBu9+HmA6zc6+Rq6qDoQpC22xeMR64u4ubGMnb91ww/GZtUwPdsEhJjbo7WQhAs/w4g6GKSjr8zp6GEOeNqsv5XhZxbFGf1TurOrT102w0ejt3eQc+UZUDsRhlwlXe57K3k5DWynYYsGdO4JsjeWvhJm6eMJkvoXbzQ/KvMs0zT6ymMomVYvTuyp4A/YPc/ywhAXWkfNji0YhNBoym8SNHsjoeRhcpR8esZTzavNjp5uVTYeOvNnMbjRcDahV18PMTcmeenRhPkBKWyN1+nhZXQBZEG0Z+cU8D9UgOE8FaNA7pMV3/cMQsAmGtySVVoVc20cic2wzKTeAB8svFKnh3RZ+XE1hPbIVOn7nSXONoty70ncIsyxyhgWo3Zg9JJGlhuQkICObl14VjTZpFL3GCC/078e80u0FzZFN8MDxwJPKzgACf6hbl3GbiDUBaLKWl+5V7DoUnPV2E1HgwY7vp0cIy0Lk81uKxICxToK/rdZhtcXl+DaXqfvYCxKdlkAg6blxz/jnMh8/GsO1272TKwPERaN7isX+0sDhCwjNMBCCLKF995jAZq1tsEb5WXZmG6LakhI3OQ7k05Ml8Vnx93qw+XTFdHiDlAswK2J2mEFiRVQ65cUgtrd3xOp525GSn16s4QssTGbuXPZ0en1WG76ArMKhhjL9t79vazbsOKHp4hRgWJ0HZdjUvIT75sjM+48Q6qJNWlMXrNd5tjyE/GywMuiAtajDIVELQERKgv24L7UqK8My3eHxlA X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1303dd4-0feb-452e-2bd3-08dbb38c6adc 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:09.5895 (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: AS8P250MB0252 Subject: [FFmpeg-devel] [PATCH 2/5] avformat/wtvdec: Skip too big tags 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: tCFgd3ZrzTc1 get_tag() is not designed with negative length in mind; in this case, it will allocate a very small buffer (LEN_PRETTY_GUID + 1) and might call avio_get_str16le() with a negative maxlen (which relies on these parameters to be signed). 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 1103f5ba03..2de6dc2103 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -539,7 +539,7 @@ static void parse_legacy_attrib(AVFormatContext *s, AVIOContext *pb) ff_get_guid(pb, &guid); type = avio_rl32(pb); length = avio_rl32(pb); - if (!length) + if (length <= 0) break; if (ff_guidcmp(&guid, ff_metadata_guid)) { av_log(s, AV_LOG_WARNING, "unknown guid "FF_PRI_GUID", expected metadata_guid; " From patchwork Tue Sep 12 12:34:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43714 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2751095pzb; Tue, 12 Sep 2023 05:33:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKsphDbSVQwM9y2PwC6aacc0Qqw3Mq6Ld0bj78PTQEhqgF9fzGMebr96eBOfF7l/lBLazd X-Received: by 2002:a17:906:5e:b0:9a9:e659:a8a6 with SMTP id 30-20020a170906005e00b009a9e659a8a6mr11329317ejg.15.1694522023044; Tue, 12 Sep 2023 05:33:43 -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 e18-20020a170906045200b00977cb7af75asi8166066eja.719.2023.09.12.05.33.42; Tue, 12 Sep 2023 05:33:43 -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=eCxbCjwO; 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 279DE68C990; Tue, 12 Sep 2023 15:33: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-he1eur04olkn2036.outbound.protection.outlook.com [40.92.73.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2763968C9A2 for ; Tue, 12 Sep 2023 15:33:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E6V1IwLEhEnoGb/xkTj1rJo4l5VTkXi8ofyDevzy822082vcJfCms/q77ty9k7grQ4wh+y1ji9c3dngtRbpYgq1KE3EDUUwwwazMShhCszgel3JbwQZqDxxYzGnEAuaVi/FSnxQx17os+LeoVpZA4/u4po4YMEYEZo2cP7z81YqP/zRPV5tM4PXrewPHTbMSNnMYgQLYDIUYo+Qf8qaTgs042QZbWjAT+GBpGtjnIZnemKNd3Ys3B8j6qUZDtQVUTKKjmFfmFCixCqdR2JUOWHxnXlTtsLHQBVhQNbAwyHrMNwhHegK4Ok0FGpF7NjTWr9epKlyTEJfzjQ5aWpCYvg== 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=ftjK0/4rM+gXSCaZwSKgyMrjYufJ73UL+t1pNvRco0M=; b=Txvby9UFTb4rnBkvGvdeX8SrxtzECxR4SeY9QGMswOCMCt3QbOxkGNntBm13lw3+iG0ynFRBEZ2nWGKvRm922yj6tbtIt2YJRlcTCZiW9pAWBYtjMZPrG6sBigRP61GAn4346EH9melwL+N+Wx4TN+HCDW1Fu6/0lJsDlk02ZbD+W2RfMspKuqc5w/xZy5UA52abt0bCbUcVB/7G8yTDRwHgXe8PVMcwrgmwm8BBFS1vvpkY2JdUtA0QYlKJPhAZmZ/Xx1rz59veqonvKJwZaWzVF9OH58W0hMsQwUgBK7AY9W5csQlWmdhNX6pGSNh5YEK1KHvc26JxC4V9BchNPA== 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=ftjK0/4rM+gXSCaZwSKgyMrjYufJ73UL+t1pNvRco0M=; b=eCxbCjwO1Ypoq+/OQj7FvUU0nK/F0RKQrHY0MV7EM9uI8FwYr/Ztd7580f/OD0WjA1vlP5axL67D2w4t8iPjOp0vYM/wbLRLql8JkpnEXGO/PlHJTD0t/a7RxtAOEzD3mWO9COlko4E2yAvlPkpGt7C6e2ObnUcO4fX5tj93vUR+V6Auk4L+7XwVI7acdaNOy12a6YQjdz6x1844PQOot2Zb5fbVPSyJQpdhTsEjy+58YH1ByC6/1WgQrvOraHOEVVE1d6uBUINWujMmDez2PGHECK8k9T27K/DeXeoVLTjVf15NDBEJdUDgRzqgzbitCbL1yuu3D6LcjO/JifJC/A== 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:36 +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:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2023 14:34:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [guVd8iBI5VUO8VhPM6oafiOgbWvc+0Fk] 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-2-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: c93a63fc-3312-449d-57a9-08dbb38c7bd3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UDtmX23l6FxfqpODXS/rVEbP+HKdo0zUhrSryoay5h7rlIi58oE+8Nqz/ZOapKZ7f3a/5fitu8CKbCsmI8kBISq5yqldsakX8S4skplAhZwGXNh8cBimEXrKYS8y49XTQ+X06vvfMo+osZu3ljtKDO0KMyXsbzS4gOtkoUSd8QDApG0ZwPmhQQ72H+VKXhA4EudoWKoVWA7IvbDuNdMkm/F4DB8yDHXA8kGNdfvDyXjx6Ci8SY8T+gHrD3BXyG65C+BrwJMFXZIyyiT/9+r5N5iSkkTJcK4ZU5xqpPzpFlAhZU3YIV4OmlEsazUNrYQCiHCmTz57tnqAL7AUc1X4YRnwn/PjzbdySC6rXRhKxe/vvEzotB3nFdVTiXnsTGfmtfPXx0ECwGY6FHMX9pstldT1cVy8sgQh9srPrfO0QA/24iw35Rna9AO472TtRmztdPUsN3FsD/h9IQ3/HhuH+IUs6Jb0XfpABnrfgsBNXJ8rdcT52lGMA4OqHnvkLwPfoK+WFenm2ADt5n2Q9Rq8lWOuBHYUxt4e+VK1oMepHtZp7RCy8lsjMQNybHfOcjP8hahlpkdqnzUe+CfTyp4LHvVedC6zN7kHB4QW005a17JKGRHHcgTop6D20v9aKK9T X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pqpboAwjbYZBwGrjPFWPCjehenwyaN+014MQLfDq3KjJa+fh99UnSzZcFnwwwOvgM5KOhnclTPHqBvFXSVRm3hN/hdLw/3G0oS+GI0zdppnu8y6uBaiST8jsF58wMieKJwF22wSDyql7HbVTc6vQ/jRMosshiB1800vQ4v8njf2DUiO4gnnqLE+EP7kTc6qPkS/1GfOUjUio2EON8guN3CkeYjJoC9LKLfwcm9WgLgCPrR23jtfhtGUtvb/sibOzkHwPD4LJkNeGR/LxbGYyxadgROvOS/rmkM1Umz1L6dAMc0YoKycrCe9usoSFSEW0a+oKqYDgspa5p3yKcD7D+eQSyEpraR97SX/EjnF0jBXKJaNR8/V+kPCKTVdiVFESC15b+ctCEWqVS6o8P2YDd/7I9fTOMHVfD1QNuOIhyp3Hq/2ZLGWptGLdyyRzkFHLRoZ4yzeKIZxNNMWM5vf5Zgjdr/dZP2ed6qP6dB5VbomHJK22vJxVVCAFye2T4yljOewqi2cq1keozZ/V7F+PlbkgS47iJ1XeX9IS6WQ11USBFjfl6/dLbPV2k2Dma3fOGSJeC/Oq8wOoNX94o/8zRcsybWzGLhrKwFQw2ZpxD3A1UmOLguNcAB9aSua+WWtk6MRcIo6tyxcgspqR8wpsGvH9AhRZah7cbxPDAAYm/Y+Ll/wzfodypHEf7tqQq0ZnTQ9Ff9fp9TgQTzUToBi/Ll5TMaXf8z2WyBmgZRUHJrIgMCNJrEVh3ZaYfR3iJJ0to0n7maTqn5RcOKAqLRX+uIAZnc2V6YCc9uM2pE3DX5fALtBLK90MIPM5hPLM0vV9eF2TOmsSQOhewkwHQgOBLhUfYYSy0HC4adOynhTTMn6+6PPcgYuI3ALGuW5q9EAxF1w/+7GTG7bGlWTxD2dT499lI288ZxoO6ugK87eSmWFPH7VtiENLtToWDxV6cND1hn85Md68DDJPILTBzs5SegdwU++lnJrxqWgLypGfsDChGiUtMQ/HTfQqh+szPnafwFibnd2CDFjv/F6lrO4NsMceCI1kRSCqQoUQhkI+51HHlaUUAQU4154BSlp6CkEBX9X7oeUMJqUwC9hmAsSiQz5Uidr3eUjFrHcgkZ+HUu1E1l+Y90NrYEB5OL/oOLf6YB1WSri2m9ZyuHL31D0LMRZFhrdUqWclA4uqDBuw2TdNnyP5nrA/uKAYu4n2zA2oTxJ1SrRXGtc4XYkfHkJmDpn80Y+0SzsYpOsRUoyZ1grWJyeqY5jwvBJXcof2GPJh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c93a63fc-3312-449d-57a9-08dbb38c7bd3 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:36.0017 (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 3/5] avformat/wtvdec: Fix signed integer 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: 0M1EmTXGLAMH Happens when length > INT_MAX / 2; use unsigned for the computation, but restrict the value to INT_MAX, because avio_get_str16le() accepts an int as buf_len argument. Notice that it can happen that the string read by avio_get_str16le() is truncated in this case. 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 2de6dc2103..4ce4b6403e 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 = FFMAX(2*length, LEN_PRETTY_GUID) + 1; + buf_size = FFMIN(FFMAX(2U * length, LEN_PRETTY_GUID) + 1, INT_MAX); buf = av_malloc(buf_size); if (!buf) return; 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; From patchwork Tue Sep 12 12:34:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43716 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2751319pzb; Tue, 12 Sep 2023 05:34:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKD+UxPFz08wK7C3Kr4OcPSuLJkDu1zOwHuXK6YNWPLGgagsFF+yV9S/STII8p77zQVJxQ X-Received: by 2002:a17:906:3117:b0:9a2:143e:a070 with SMTP id 23-20020a170906311700b009a2143ea070mr3373392ejx.20.1694522044822; Tue, 12 Sep 2023 05:34:04 -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 h23-20020a170906829700b0099cb1b0f42asi7643838ejx.707.2023.09.12.05.34.04; Tue, 12 Sep 2023 05:34:04 -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=E1TCMk28; 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 2345568C9B7; Tue, 12 Sep 2023 15:33:53 +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 B279B68C8A7 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=mO2YJoza1dYl8GcI3afsP1LZ/bhPcFbdgOsftiCbNt4lteAf7i37GrjAuAr/xmGPYxkVMo6B2wBB5mB89muOu2mSeDY+PC0EswWXuT5HQRXmbK4ryR9qLa7d8odeilVJwJMsd9ni2Zm1MS0q0thH+dm4SMAbLQa99R8sJr3MFbr27rvJPA5UH+s3HtZaTClDrSinePqgSGX/6nbKAYlyrC3ipUjSwbsmxMR+/wntBMsqef4Gvpo4tUGByo/nz5qKogLCDCNuKT2rkQdPc67S+018ToQQy2llxw5JNZLOtVn4Lxq2+hLPJBFh3hUaU3hQYiTMsCDPSULv6BWqN6RG8w== 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=s2iRHMVaFMmMU6OMvWA4EqafVNuV7elr3pgr/6MMoyw=; b=jsLwE92a+UbD2MJhQ80k1JQupxagM2xyUL9cegzr1GucYO3+9hYfxVa7tLOkTYIemKkoINKdR2EicAWGAjbQfCFAGX7gRjC7galsaXny4twGfD/5yTg8X5BA0EikFLm4yTYPabjDuNdo2Y+Uk02x8IMduWbn4HjSneIrEIb/GxFxNxgh97wAi8qgPJMl7VuHrjPl7VG486Nsa7L5yrSpXokqCx+I6jeY2pywj6rmRkas+xWQYzu94Tjv5zgyaT9aI6KqtQSqPmzeWhpW1YLh1VlJufqoYWImIFndbke5OInaVCvvEQzSbUYN0HY6I1j+fuWBF4ZcSQh3WqtkmYDobQ== 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=s2iRHMVaFMmMU6OMvWA4EqafVNuV7elr3pgr/6MMoyw=; b=E1TCMk28QYFm+Wwhc3A1eocUGaD9SbccYJbcoLNOxYNdQ8mHGOmrON7MnQyrrBAjxuktjsLa1nIm2TdAQa89H24Hbo0ztjhdeVuEcwkyNpjDwUKqJ6GbnCxk17YfxOujPqxV/DDI6VyI9DJiqzgkFIJEZJwODgcpbU8Cid+QrlReKKugjYEHnxgSiCOE+GW2/IUMumPBwaUU3UUIVgy2pHHwR39it9NwOJ7VCCQy97HjyZRHdwtGI/vc+IKRuosDlLwRhHje2zk3P0Mv1aYHv6CUYLtWWP6DSq3gpsAEtc9UX4Lr3GLLg92xOrhpjiy+8LCA7+wRmwupQHA/St7vhQ== 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:50 +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:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2023 14:34:19 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [gI/uKU6kD643spoII1pfLNAV0Dzrqd27] 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-4-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: 7ecc8140-65bd-4b36-8ff9-08dbb38c842d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9OKQgRJqE2zs+DXNTKvJ96X0yI3bolFCTMGjAqwnaprM79y7TkrJXXCGzWdEkiARtHXMhIGVZTuXtnkLKDrnO9xnJRIfk3eT+N+zAOFO2ulCHrvA5N4P/acSuDfBoGkRQgjtuHPnVA+nzaaTmhHLFt9l/DHTv13vcm/C1oI8tsjw7Mi9V/noF2Rv3xR5G17oK6xXl+v/GugNsO60NohDinYjQauVNLYuQOsUXXagOJND6CFX4G3wLkPxHTPG027ZLzJ5AcF8wU570pRYBLqyOFx5X1YM9NkMbjkwMLrxeyp7VCt7oEgdezoEHMBdIUsAppdIlCk2sSfFQxxZmMS+KJVT2856WOmFddqBDIp6k0pL47UrG+nWPATj+oHCgXmBm1afklW1AtCdSMqvnqyUj7aGd5HOCMOtUkU1ZulHrD57fAUCIdxs/1MQagiWtWFxUGeVOe86/Pnr2M0SGOMjLIICmIQ6X4Sn96/vilitsQKcnZ+TVSr7+UsYjCHChIYqsw0uKcU6qZFLj33AqejpD+7Q4g6p1hxAPTlyka5aphhVa6HuKQrO0X4W9b87BoVdsqtLl1H7mVqKLaDgCTwqTtibjUGSspCtGSXatW2sehC7cx4DtfZGvgWNIQvAeiC0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sCKVGM9KUEUGPMPkWs8hBE8vUwWXZtuzryCBEB2XeFUeKwZkXWgAQ+0AY1L1PT7MymLnuNKC8Tb557g35u9EvsNnIVz5zBy2/5cL9QY5e99HDaSqU3ZtWE5GcuCJZwe8162kGor3Y7h7O+MWV3HJq0rtk6Du4XsYdPNAnWe+hvxzTk4KfdDgDtgQGAUr7L/VAXYCMHZg+/20uIb2jEude0ZBSe0i4c75ZojxMNZwAU1Fx7vMAitz7U6W4FYIVsM8u1c7/hGy4kLemzvIapa1h3VKfF668bgJOXvz12AQEaxRn26Qezvr32qvbxxCOZJedVgY3WTldZXP/5smQFDeI0ZdchOokDPWPVKmsgxEPkwCE59Gcc+CsBsvrTJa27i6mUrKxx2YyaTNHc7RXGsR11zrFwx4hjhjJY5g+5pSfCvOYEnOzd4YF7+UKTx7pekhDg9+2BirIbwqjp6rRIvyCG5oCq+T4SY0rUSqDlAaj1KUREA71mpb31DPlU39oesYBHgAtCdM4SN7Pj/KUXOB/6Q9Y0Vnjj48y7yk+DZEIj964vk/qMRwA47EIjR1LsCqaUViyDnpHtecKmJSAp9Ki5NXcl6Mt9sFj+9pMNGjags1AQ3XHij13oJJBaDzN3nVC1KBxl+b6W7V8E7mrj3JfiqiGh/uSh6cvGDRDmrg0rl0U4h8gaPTngPS7n9dn/+GCaWuiA2pELd/AozzhyRutp94TCe5N1Tgqf5KLuKY6L0ROgwCdqwudaea/wjbYxU4kzK4BAJ6d449jpPfELeVzdwtHfnNQ4Aew1nIl9dS/WnKefaBa25tGW5n/t3PZcBprgFrqqvuzFWHnOMjyOKyYaVH00LNGUeOFwpuebvc4a4Dkf4Tvf4HUVWYxRGn9HTA/WUtiTQSRvZgxYsZFf55blmwZRvgqcz8BUsnjIQQJgX2QllFvo5nCb+aKWHd7IuHhLIkCHveh0EpQN6NwptdS/4x3/rIKXcLTks+RpW+MZaO1ftmujHU7H+acuZwYuUrPsDa3aNrykL4NX5MCwlgdk6mPJaqpfnBGR8GH0smkX7fQDvqiJYwTSZMcaE6ze+kAtUqFS/XPteuwOH3GmvebIq1MTr0OyIQMKQ8Uvu8pKpEPgg7uiVMXDtouLbSwuRJMXbh8zEZJ12Gy2Qy1aKAvdarQ25YPYn8ZUJLjONePOWs3e4HzIH39ZjEmwI9yH8dgDXeGxYg+U6dIgcklA1mxn9aZHAu8BQ3By+PS4kl+fe8NlN7uw/l00aJl2OJQuG7 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ecc8140-65bd-4b36-8ff9-08dbb38c842d 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:49.9786 (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 5/5] avformat/wtvdec: Avoid unnecessary allocations 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: PEkaWlcaLtOf Signed-off-by: Andreas Rheinhardt --- libavformat/wtvdec.c | 47 ++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 9fe00590c8..e70470f79b 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -460,71 +460,62 @@ done: static void get_tag(AVFormatContext *s, AVIOContext *pb, const char *key, int type, int length) { - int buf_size; - char *buf; + char buf[LEN_PRETTY_GUID + 1], *bufp = buf; + unsigned dict_flags = 0; if (!strcmp(key, "WM/MediaThumbType")) { avio_skip(pb, length); return; } - buf_size = FFMIN(FFMAX(length + length / 2U, LEN_PRETTY_GUID) + 1, INT_MAX); - buf = av_malloc(buf_size); - if (!buf) - return; - if (type == 0 && length == 4) { - snprintf(buf, buf_size, "%u", avio_rl32(pb)); + snprintf(buf, sizeof(buf), "%u", avio_rl32(pb)); } else if (type == 1) { - avio_get_str16le(pb, length, buf, buf_size); - if (!strlen(buf)) { - av_free(buf); + int buflen = FFMIN(length + length / 2U + 1, INT_MAX); + bufp = av_malloc(buflen); + if (!bufp) + return; + avio_get_str16le(pb, length, bufp, buflen); + if (!*bufp) { + av_free(bufp); return; } + dict_flags = AV_DICT_DONT_STRDUP_VAL; } else if (type == 3 && length == 4) { strcpy(buf, avio_rl32(pb) ? "true" : "false"); } else if (type == 4 && length == 8) { int64_t num = avio_rl64(pb); if (!strcmp(key, "WM/EncodingTime") || !strcmp(key, "WM/MediaOriginalBroadcastDateTime")) { - if (filetime_to_iso8601(buf, buf_size, num) < 0) { - av_free(buf); + if (filetime_to_iso8601(buf, sizeof(buf), num) < 0) return; - } } else if (!strcmp(key, "WM/WMRVEncodeTime") || !strcmp(key, "WM/WMRVEndTime")) { - if (crazytime_to_iso8601(buf, buf_size, num) < 0) { - av_free(buf); + if (crazytime_to_iso8601(buf, sizeof(buf), num) < 0) return; - } } else if (!strcmp(key, "WM/WMRVExpirationDate")) { - if (oledate_to_iso8601(buf, buf_size, num) < 0 ) { - av_free(buf); + if (oledate_to_iso8601(buf, sizeof(buf), num) < 0) return; - } } else if (!strcmp(key, "WM/WMRVBitrate")) - snprintf(buf, buf_size, "%f", av_int2double(num)); + snprintf(buf, sizeof(buf), "%f", av_int2double(num)); else - snprintf(buf, buf_size, "%"PRIi64, num); + snprintf(buf, sizeof(buf), "%"PRIi64, num); } else if (type == 5 && length == 2) { - snprintf(buf, buf_size, "%u", avio_rl16(pb)); + snprintf(buf, sizeof(buf), "%u", avio_rl16(pb)); } else if (type == 6 && length == 16) { ff_asf_guid guid; avio_read(pb, guid, 16); - snprintf(buf, buf_size, PRI_PRETTY_GUID, ARG_PRETTY_GUID(guid)); + snprintf(buf, sizeof(buf), PRI_PRETTY_GUID, ARG_PRETTY_GUID(guid)); } else if (type == 2 && !strcmp(key, "WM/Picture")) { get_attachment(s, pb, length); - av_freep(&buf); return; } else { - av_freep(&buf); av_log(s, AV_LOG_WARNING, "unsupported metadata entry; key:%s, type:%d, length:0x%x\n", key, type, length); avio_skip(pb, length); return; } - av_dict_set(&s->metadata, key, buf, 0); - av_freep(&buf); + av_dict_set(&s->metadata, key, bufp, dict_flags); } /**