From patchwork Tue Sep 20 20:25:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38117 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2185399pzh; Tue, 20 Sep 2022 13:25:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6F9Hw/rateatXxiNSBjs0Oh1+76qEYl0T4mZrtNoBcvIvQZToTSwN3YEmt1I6sFV1sWSmB X-Received: by 2002:a17:906:3e01:b0:781:6462:700f with SMTP id k1-20020a1709063e0100b007816462700fmr8068602eji.307.1663705521941; Tue, 20 Sep 2022 13:25: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 w10-20020aa7d28a000000b00452acd393c5si599368edq.293.2022.09.20.13.25.21; Tue, 20 Sep 2022 13:25: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=HUt3M8ZZ; 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 9DFC968BA44; Tue, 20 Sep 2022 23:25:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069099.outbound.protection.outlook.com [40.92.69.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0199268B6F7 for ; Tue, 20 Sep 2022 23:25:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iFmghoAgYM/YPq5I7GKvpKqx8lF2qSaqOyNGkInOsKK8cb5W5zW1IhwdWkEBkKXrM7FMAUZNZ7B511eABGmE+mLyzbNmfhJe2sK0PmanJktOhFKlc+C1bqtJm66MD+GvirV15HP7X9UCTRZr1HJu4aoSMcCKtSalzi84B1ElVTOMfMcecTKySEq+Knm7ZoM3WKOCmcn9tzTsZAJzNvT6bYqGGRgX9Ispak3/a402tZxXgimVrU5IOQyu3Wd/pcBU7aOk2Mta4J9t9grfN27JVKUFHkS3+XDc8h4pWnToJwY36n2OWgd21TLjNVN7f+yH5A2F6yqoDnBR9pesPZVaLw== 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=wAiYBcv6nB1/BNDN/ovYXOZNaPrPd/QSJnxLxS7EXVQ=; b=JnsJpwXQRwp1FWhR9shgStxWF0DKpTM545i8NY4orI8VGO5apiwGA3sU5rXqRtTAEhYV0GD6CVEGy7UnXc2xrTsB8h0ccWDIsB9hNqnssQb5H/zoOV7paEvD3y9WG50noXEh4Wti/6FXSjh2SJOxqcdwE/TXVQsD+l/lVd/isqFc8oPIy5LccCA+42lE+Idrp9L71SAF0S0FN9eN7+f3cYQs1pcC95oCGgQ9rqTZYKVURVuQiDY+qJFDcfDcGSypVin5xFyhxoSAfniZJK/6pCSk9uXT4CUpfx8iX5bWtMC9UWXW3rrTO28iL5XBFl4jDQrUHBDI5Du9v54VRQQZaA== 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=wAiYBcv6nB1/BNDN/ovYXOZNaPrPd/QSJnxLxS7EXVQ=; b=HUt3M8ZZgW6rZCuGKMYqMO4jFf4EJTNtph5LZbzMYwXTuO1cj9Et/1u5pEH3lk/oYv/v3OCZ+1dmL0fNqYHBRSntPMyW4Nht+qEcl+qTE4Laxv1uj/AxEX1ytOb+7LNiAHX1BLzZVbVWLbxGur99tJdhskKg0lG0/ghGHafRd305RZW44p90Be/QksRChIRXmfqsgOT62ip9cv47Y/M3BO8Juirx8Ce2y2N291Rh63FtpvSD6LnkHFcjBfW8VeC+xhTOnmc7/vxmvZQVhc87YLCLA9WktaRarUuOJlNB7gbtnoGbnkSMcN0YE94Ha30ZyTolAyf/1cDAVdihvSm49g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0795.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3e2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Tue, 20 Sep 2022 20:25:09 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 20:25:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 22:25:06 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [1VvFowgRv//nPLIxVPXcQiDSGR2InYAYym8y/nsTV2g=] X-ClientProxiedBy: ZR0P278CA0146.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920202507.5956-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0795:EE_ X-MS-Office365-Filtering-Correlation-Id: e45f03df-7d60-4f20-4838-08da9b463675 X-MS-Exchange-SLBlob-MailProps: V85gaVfRD48SiIm8TzPkwkhiFQHY0EdDD8SQfQli7+Ew3+PhtoRKlDasmsHM5EqUMv0QXDAzL0/iV013OwyLAvy2UxztPsef1Xc+7M1C2Z7h6hgN2AKuL7rGfqkTtPzGRj4/gvfmkNkz1VFGEelNMNYHUUAgpi38MJr4AiuROBj/NxSU1PuNubIihjWDvK6UGDxQ7lfxm56ulhYEmoRx+xgDwBE5oErYeoF7uAltUY92dHmlng9kS4MWarTHC0awCxXlamnirp8muUQYGtafghGtUpvySVAyUrNAuVF2ob9PCc2jz2A8SLYYD2hgOcquTM9GgrEpAnW/+xnYHTnkPC9wd8vhcEG09gNTAfkzvsWqfZNX0RSGSP5d59E/0ERoLzHsq0Tsi7wNJStqi+Q8O28Yer9OqOlUqVRjJx9iyS0IX47HP51nDZBhmEMvg/KdFWpu4TOLAP5MluslucZWymu0r5dImAmapViMu+p1oIas+31Y3JWvRhfIHaEaOW2VpZ2OUKo2bh5rn2lviV5UTpJ3AbgYI2ac9uBc6QXBtut2w8utnpZXsBiR7xlfOzqY70cp0VirTdJdsMAwPhoCwXAWQBzGBxSKmvhpt9+6vSByhGMFH4NIzvL4Crl0jwJB8eBZ8lFubbEGDN1lyaWk0RUW8yPpczd86JmXnqzZ5RfDBXWv0EXPEhuFu0vDLPPx8wN2spFJmefiYnGPBs3kkjYq+rGEqM2E4JjZS9Q4QjXApsMjYQGVb3m3Y+bZVPAMeB4zJxQ8ETzFOajJDas1/o9itwH0l/e/Q1A1P9wb+wp5tpOUvcEglaEu2dHhsji0i1ImmMyElSncMJ01xMjMgQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8n+kjtvuVb4vw5/LmKv6AdE8MaDnjdq7vBHQOwdb3t8g64f+Eb/kFpGOOQafyGmXF99Xci6gLj40bG6PP4plw+hB/U8ps6gUrce15NUa5ikO4zmPAY36fPy+RG6esQ12J/UKy0OZA+jkHOakLeVJmqMV4+mBoRnkf1CL4iUegDEF2BqnTLuV2bSIuhHb6Cp4AbBDzZqzcRKadOuBe2BJLo9/exjHVwXEIxALzQvWzk9N1/fVKLbXTvhSM2pUJXpNB48Jd9CyWFImiI8RnHouHapJMhk3iB3VkeR4A7AemZYLsGru6Twr7XuDARmg0MYNflnv8oMP4tb/EVGKeLtECEK3Bv8vQFnwdNGUFE0YG4BjYCI7EEfLe/WeYmyiwXYlOoZgVsrun4Yfu9wueLkx1FUPph6yI/bZGyL9N5RRTwuC4bpQ9YPlwmg7N0qmJZw3PPnC29qjrmvJz/vPeFmRx09BCLzHevWDgGdCh/pSNDKmx0HFoJRMMZVp0uf1vTj3PA2n/sIM7Sogg+QI2WY9id7W+U5f6Bw1DClAasbqZYoDqv/FS6YlwGKuKlk9xHv9vHNYQX7bg8XJWvobCIXZclgjrdStDE7MhJ9kMPmX5F+Y2kgoTfjHtu0FPlB09zUs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BlDCG4UdXWKXbW2JCiykeo56aLQEni4HKGrxAkM7nOgG2WGzJPoBYRvWok28K90PjHIR4ouAN7jDTeO9YmeMhMZzQzMY970eRXtnxMusuCtVrj8xWnKU+mDMzQJOhaXrpekPULiF2U8JIWGKUr/i4tBecZRSkyxvFVvTgRBB6YvdGRjZlbLXo6An7iAWxk1ivJ0aZo03Keuv+V9/Y707TSz29DFBof/AHta2Bnpiwu+/DOrzDEeB3XXdBEJ9C2Z+lsXKg1bxJTgsdoJwGgiSpNlGf3g4D99MxtbGiMdcoChaLnWmUo9RoCkLOXpiVx89mBhPlJ79owsuc+4RIT9Ux3tf7l1AmJ1m6zPrnx5l0mAGZ9mSD5MfXiwSk3eiOAC4r25tu0Q6k1/dymMw0vrZKy8vQqnt8rLZdD7JmMoEYAeTWUpYrMaKN8kfCi1vMtOLJm6T0D4t7Jzcur961RBXJ5IYvsQjmdfGesV935TE5cCwK3QdoMYzp9D7QIECLppRAMMHK4YXid1kvmXeaf+GXbtHj6PGRQ5U1HOhWzH/KdUKZPDlwbY80bi4X7aJvV5Pwvkm6VatuDT04a+znV7lLvAWVNpswoG90O7M6XJ4hjrIWwIsGD3/W9JepCBpzv6amRB3jj2b3+g+nrgqrLTp471Cpc4/PMLCmvc9YsBE4zN2A4rahqgn5S1j1W0ve0hip44oKgQTtuz4TvCCaCq3429E1hlxtgEPrTdONWyF+t7VVljgCzrYvyO0XRW6aUb8ENxFwhDn1T3bUNYfE9d8rVYsb5/j/xcibcrlTQR/W32xcVbL6a35jozFkQmc5mxBQFfkpuPFauH0UCuZiS6Tce3K/tXNicE0XBSK9KS3RtZr/LE2YSGv9TX24j+rfE28ID34/we2hzu6n4aDfHvEKcDX+B9xxHU8yIBDREuA49hbglKUxIZlciyPXjZTHkQ8tVbbrzFwMNzejFcK2zvYhorDmGc/J/3/zHiND6232gChM5NL3Z/5ZSbpljYfawvtITruT9N9u8Cw4fwu5+o288uqiMLjnBVPFcx549ZGl1Zme6h4RyoPaLkEF4qcNuEdnnvLBQCwaHemj+OlWHA8mIgR0utgO4glAmqfMyhM368MxXBTyzt/HSgoiua1JzT+o5Ob99sXrkjQTShCsn17YrNIaUbnCJ+CPEGAUrlJtv+0bL6mUBM/ard3snCKgjCHfR9yqGLdzvzdSZ0IJjkUqAad+xmNrrzb/qQGLMerQVQxt+HVz9kdLaany2EnN8TDQPd60a8APE31tG6EkRFf9tbA9bL84QRMbKG9rQRCUqzEDwPPB4fhUXHUaHoL01wx X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e45f03df-7d60-4f20-4838-08da9b463675 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 20:25:09.2361 (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: DU0P250MB0795 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/dashdec: Fix crash on invalid input/ENOMEM, fix leak 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: tUERVp76xuS2 In case a SupplementalProperty node exists in an adaptationset, it is searched for a "schemeIdUri" property via xmlGetProp(). Whatever xmlGetProp() returns is then compared via av_strcasecmp() to a string literal. xmlGetProp() can return NULL, namely in case no "schemeIdUri" exists and (given that this string is allocated) presumably also on allocation failure. No check for NULL is done, so this may crash. Furthermore, the string returned by xmlGetProp() needs to be freed with xmlFree(), but this is not done either. This commit fixes both of these issues; they existed since this code has been added in 10d008f0fd9e713e290f626300d66382ad786c49. This has been found while investigating ticket #9697. The continuous leaks might very well be the reason behind the observed slowdown. Signed-off-by: Andreas Rheinhardt --- libavformat/dashdec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 63bf7e96a5..2ca91bea8b 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -956,7 +956,11 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlFree(val); } if (adaptionset_supplementalproperty_node) { - if (!av_strcasecmp(xmlGetProp(adaptionset_supplementalproperty_node,"schemeIdUri"), "http://dashif.org/guidelines/last-segment-number")) { + char *scheme_id_uri = xmlGetProp(adaptionset_supplementalproperty_node, "schemeIdUri"); + if (scheme_id_uri) { + int is_last_segment_number = !av_strcasecmp(scheme_id_uri, "http://dashif.org/guidelines/last-segment-number"); + xmlFree(scheme_id_uri); + if (is_last_segment_number) { val = xmlGetProp(adaptionset_supplementalproperty_node,"value"); if (!val) { av_log(s, AV_LOG_ERROR, "Missing value attribute in adaptionset_supplementalproperty_node\n"); @@ -965,6 +969,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlFree(val); } } + } } fragment_timeline_node = find_child_node_by_name(representation_segmenttemplate_node, "SegmentTimeline");