From patchwork Fri Apr 9 22:13:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26825 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2897144B5E8 for ; Sat, 10 Apr 2021 01:13:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02BF968185F; Sat, 10 Apr 2021 01:13:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070074.outbound.protection.outlook.com [40.92.70.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EF0B6800A6 for ; Sat, 10 Apr 2021 01:13:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TMBHWMUGqoeHUmbQgV9SwZ2W5zcAejcL/ydgrpRnLdzuQx2AqQO6eq15KRyr7ckC86QY2MqiPwEOUUgYU9AtjfiboQK6krTorvwbb+54C0hIUHDJkI5Ut9+y7aazUMz0TuRN6UEOaZdBPN6GyXcXNBpG339Fo689W+RPZS3MfDy5qzgT3iAUBWp8a/VMc7KUfQ+xUyn7/NP7k+/MW27DXE3Qro728c7p/tlHk+XzaliQa6OavsupwceaS9bpsJozWY6VzRKhZyjZy8hL2fp0Lv2yb8Uacebr9pkA/d+gQq4/ZBUPEl6jHQ9dIGxVBFnrVSs8aB06t/WCYhZ0QdxY5g== 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-SenderADCheck; bh=gmsShMPsejFkfCGRE05X8icQWUPhDJO4gAK0mKN3E+s=; b=nUuhYuWDSLJalidTx3i2XOTFxoQW3zaRPR5oM4VU2dFW7lzdN+cBJBgxj57IoYI/Ucjb28S+ltSKeE3hyZzOajSE1xoX1rVxIysF+yKyPTKoa4lmn5BWYgI3P/pTMq3pq5p0AfSER2qrBtiSzgQ2VO8tN9STL2nDxD4wqOOIaW+tLkqnHxJEvu1n4erkqUTVf7Uyb3CrD3MhpJj267fnFl9VgSjPh6TDlPkGS1+Rt7PPqIvz8Vhb8UF96WsooTnCIfJF37FPQuXN2uOElZVuMqjx+JHScF3mr7GYyzTH9mVCh5Ta/xCVFBnPbCVWn2lgTsCLKdthL/fTIIPhmfP1Wg== 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=gmsShMPsejFkfCGRE05X8icQWUPhDJO4gAK0mKN3E+s=; b=WAjlr4GWE49VxwnBZPoDYHFUNXfan75toE3Eqe/+Y03d6UtE3+Z+XZi4dvqTPfrRxGjs5GH4mEsGL+aI+fU+286QWxfiJ+M0fILnesjPY1b1H3T7/LFLLGG/Fh/+JCM1xnqz5NqPcD8Im/d5X4PcrCvSUGwMJJlxY+xRfOnNYH/tVLt/CtXDO/pGPCSXVu5ELrFMEB1Sg96e3RG9DwwvhhE6M9JH24ya+wFkOfeVAmBi+N+O5molEBhKsNCaJk66+4Fd3F0tClpt36qmaiMYMIcK5BBDyJb2tfgLdswkhT3zVoDfS2OjlVjMkwbbsKJijw6ZlnaLtoGZm9o7QWWWHA== Received: from VE1EUR03FT008.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::45) by VE1EUR03HT113.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e09::507) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Fri, 9 Apr 2021 22:13:31 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e09::4b) by VE1EUR03FT008.mail.protection.outlook.com (2a01:111:e400:7e09::75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Fri, 9 Apr 2021 22:13:31 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D8F0C65071198F9D48B0B237B5E5643CFC34DBE77F95A811B69BD58DC11E4A0B; UpperCasedChecksum:278C90184594FAA9B5F94620767C973AE3AAC42A53EB2F70046F7B33FD97B376; SizeAsReceived:7409; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.4020.021; Fri, 9 Apr 2021 22:13:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Apr 2021 00:13:11 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [Ji0Zekji9NwrUOn00LX7K5en0aQsAkVk] X-ClientProxiedBy: AM0PR03CA0021.eurprd03.prod.outlook.com (2603:10a6:208:14::34) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210409221311.1444340-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR03CA0021.eurprd03.prod.outlook.com (2603:10a6:208:14::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Fri, 9 Apr 2021 22:13:18 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: d53b69f9-7c1f-43fc-d106-08d8fba4ae00 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTO+ZIOt4NjQkgQSHsoYFkWohLk7cQP4UaSVbYZmPDz4jufAWfxWR15IptSc2Kr8tcJuFbCfkNR1wNdFJaIK0XFxEVjE4GQHETFpVqZtREUCYAP51d7vr3x4VH3coplre1E2GCR5Gf2oltpInNlGwo7FYHmcxA5P958dzKx7GkAHfydPSkUGh8LRZ++C/4q/vV8A+WKfY4m6CIE90VjRhzZDd7thD71QSxvwomEKp7tOBZwbsSBzqx2mLfyEqW1MJWJOixugPRBXkPUYEjnzgVxoN6t2avjii6Cc634Yfs3wvuqRSSkHji5kGxzAbssXDmDZXFXBzebCZ2I0iCRtLWglarynNN+5CmjvdXiLT+hJWAq21LXysClNXI6h4qpA/438Cnl7nWSk077OLuBgST10At4q2STNrM+RCMrX/kc/0aoyNlA818e/aQnB6J/drClHXdFhFw7sjeg9IZ1hTP61AMc6furAmP8Pfda8cmLtiyijLNZnPDxOemJw77wWSrOGsiLJZ9cY0KhaoRqevEZtgpvWJOLpapJ3iVkKNVc5DsJamSXfNZFDJnllQJm/U/QyTVK8q4YOv5F0zGwvYcRGl7ikjO56gVMfgxKV8CICPfVjDKSfrf4kIHJxnko8jY2yjGViJPP33j+Vr8P6PG9GJ4QiaSodACMVWu7xngxUsmF8wtdU2usQBtggBnK0KP3yMjl04u93hfDm+Y04YYx6gtbHLyyz9uh2qIBXCUb2AOgJAUl4MzrhXVtcHvdSLY= X-MS-TrafficTypeDiagnostic: VE1EUR03HT113: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ux4FKNpTXfXq8TxRr4muDS7BIWgFCeBZOfEmk0CFMGr5pmvL1y3n8iqSE6/pyfrPGMJ5AqvdDWaeXfGFukDsAiQNncxZneguCiK2uD3hhl3H7d0BO+O8P595SObKCDOyR5+HOIkbAaaMxip2Og6r4zNzoAvCs0Z43Pb2jQdedGGw7CdJiAwuYBjgDEY1SkXcD77oZXbkkRITbtzPNk1QYGo7qDNXLvTrPB4+pw5dNiDEMYnoMjM9AMmm3c1+RJbOKtW+5ilAd1PlmSqKIWGGZaOVIRCctjzvXWMY2Yd44pHEaC1bl/K2Ly8zCLnO1mV3w2Z9lKDlJqcPruCCewtACjVVqyez6UiBXWqNrNxFYTlQsS60ghsmlwV53OMGdgbOque5BwkUMzTSO3Qxu/xZmw== X-MS-Exchange-AntiSpam-MessageData: CbG+PprfzthA+JkXusTLZMaeyyvgfbMnB3a0LZEHB8vMAKv6eQGVekjwDerkjt2E3qRR/2bnvlgiSnLo/EnVwjHAlISDa0XghkhnldySqyOFMvf29d4QuMdsYPVpTfma67tiDWT/zUBcGMBevpT6YQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d53b69f9-7c1f-43fc-d106-08d8fba4ae00 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2021 22:13:18.7451 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR03HT113 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: Fix leak when writing attachment without filename X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- Will apply this soon and backport. libavformat/matroskaenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 609a588f78..7e108f2db9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1768,6 +1768,7 @@ static int mkv_write_attachments(AVFormatContext *s) put_ebml_string(dyn_cp, MATROSKA_ID_FILEDESC, t->value); if (!(t = av_dict_get(st->metadata, "filename", NULL, 0))) { av_log(s, AV_LOG_ERROR, "Attachment stream %d has no filename tag.\n", i); + ffio_free_dyn_buf(&dyn_cp); return AVERROR(EINVAL); } put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, t->value);