From patchwork Mon Mar 25 16:33:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47450 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1304929pzb; Mon, 25 Mar 2024 09:33:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWBIe+V2pSlqrWYIxjQqGaz8DrTKF9Gr9FdK3fE0WytuKMaphZYgxiDEVFOCaUK8zkfLonB5k178UzmZqhqgGW+pktHyGQ0LvIPoA== X-Google-Smtp-Source: AGHT+IHwL4o/AFF1c/mtOzGUR/WfSns36gCghKqDIizDdUaFQ7r+5cCHqBcmVdy6nXhXXqPXJbww X-Received: by 2002:a19:3844:0:b0:513:c5db:c770 with SMTP id d4-20020a193844000000b00513c5dbc770mr4365362lfj.1.1711384409295; Mon, 25 Mar 2024 09:33:29 -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 f2-20020a056402194200b0056c181cdfe6si682070edz.51.2024.03.25.09.33.28; Mon, 25 Mar 2024 09:33:29 -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="lpgOE/Jt"; 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 ACE1468D44E; Mon, 25 Mar 2024 18:33:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2083.outbound.protection.outlook.com [40.92.73.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE06A68CB2B for ; Mon, 25 Mar 2024 18:33:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T2JOLnPbcHF+sKQqqpCZZU+/Xi2ISsb5ZyZTndgHRyxGnDlJF4mwieCU+BtrS7dc9LHcQIEHGi1SJ1neEIPszjD1LDLD2f3pNGcaMKv5icug3MLNgZ4It93h/WuQG0uyou5WnuJfdPFA1L+e93z7txG0jf0226QEJTWXHqU/637ybF7mjjbvEeKadQ5bN61/G6Xkhx7ViRp1ht1ZKH3stauB9HMEuZAOmSPyEDHufjP+JzW9dDHmUGfUlo7gjo0qh5TuVPuNNbfb5+bpPSno2+QDVTAzknrJ8ZHusFFbCjjbMhDOYWBqqXqTZuXyHhHWrUu212QHySAJ8edsGXmegg== 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=mEVCQAnA1T+d+e3laLgrZyjD5tluI2dFyiWurTELBpI=; b=RFchtVsnjjWYpFdk/V9qH9O1fCq5yvavMXJR9CMnfyR27D0wfO/X4BzkQq4so9xGBXZJFPW3AP8AqFZFnLfES/wVXaPfEOvkgdCDIY+2wwdK1omn9JvHdIWg7TZF40ftCCvs746RkqeLJTzvzRG+xNMZ8unihorZpwW3MLAyKNbo8Re7YZTR+orw79sDJ/P1jVAyA3d2lGgmnangBbUO+noQbAEinsoMWMKLi9o892b3AlOehFrRwQ+/JmUvYBqLar8K0wBH8XavYwbJFsZDmmBj0twtKTlmhZfCYWwKguAv/UH67xA6gIFZ7L5EGr8ZVY38xBDGTbMDtqL8hsKHoQ== 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=mEVCQAnA1T+d+e3laLgrZyjD5tluI2dFyiWurTELBpI=; b=lpgOE/JtP1geb3s9WpX5+z/pDVzhwVvCFABmL+sMFRswHA5goELmFL0OFU/o3DD3T9xfXgq875cZI8hphVii4fVjmYCMcEbNPMNac8ZaoT8LrXH2v9fK1Stx3T7VUSuKZCJdSPjnZAZLWCVPYumqL9/jNFjIM9vXXO0ZWWvTSL9+ze20Lirkd3r531a6LrjbNJVdo3fwoTEc8uIUCdDKsaIFhWE16A/RVB8iFTplveyL0j1hJ1f70wBTLrfO3hG169WLbwNY7JbC2E1DAvuf5oq2wcne5fjqKNi151O4ek3FAlfuZJoUUxF5y+s515zn5fSBZsmIFr/dusR7o2LCdw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0546.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:338::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Mon, 25 Mar 2024 16:33:15 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.028; Mon, 25 Mar 2024 16:33:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Mar 2024 17:33:08 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [JSR8aisCi2K0ivA8jeJQxipvs6v/jlK6+cbUXtWOJcY=] X-ClientProxiedBy: FR0P281CA0165.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b3::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240325163308.3344912-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0546:EE_ X-MS-Office365-Filtering-Correlation-Id: 04ccb2e9-b86c-4856-4ee7-08dc4ce944fe X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3AxjTjHd2hjGxGNeUeSHpop/PE4U/PDv8CdJG7KWhfYiBgoNvpzzbOTAXYSf+Va5TrhA1+e6JplfIfLpKNY622aV041vVUF7utYNc0Xq496vpVySX3uO8INQqk+FSObHpvH2TdxIbTROWaIRTmBQaTiLZQelxpFxEAzbIEZc34hC7IZECcQRUEkG3xbyn9Pf3Rvnqa6rhF7zBpkofpny1WsSX6nmXfU6PiiC6k7qzU96G5DVmJ/j4ZK+g5o71lc797BhmhxL6r92p24y+XQwho3LnjNd4IW/bBVhYoUpzSqqGUoDK0cd40vhVyunMoO8ZRMC+P0RwUQ6am8EFZf4UAazvrYNuzU7Zkc3v+0cc65Dx8gWJaucBYB6gGBUpzbPGnAukpiGrJ5GKiJAXb4IxWGPf1jHCPCsT+qdjZV2NmFrgjqzWFkxneXQ7nDXpTgN9BH+F+GIvzkds4KOZEdB44nEcGTfxwjLfgXBLhdg5zUmF84t2TahL8Qc41UVhmRvMDUTGbhQ3cOjt0KcUfKz7AFOsc3eNm6s8g5C14XXlk9WU1qagXx+XlHEczZzWZqcm3q/49rW6nr2kxOTP1DiTgol1lBqG9abhSQGdeUwbQghTjdwUxWA2AYlm09ydkJU2W42ekdCQnQ2+i5NVGsxxnO3q+2yTjdMc9P/WhluHxyDHtfFJx2csnuB1yJ53lZDl3ciw+2kKSPng+dzFWvlsJlVTXThCorvNG2wK5WOnfPwk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bmv1Y4xYEf3cfQM0JYxWie0BGehD7ked4A3/yAy1h48BRT3p9XixrJJOUUHnYtO+3J88ROMVwctMc1ucKbXkiTag4s3J2744o5Wnmsp/h2evfOy9Zv/BJoJvwHwQhcdHsnbPh3OmQ0+1lYrI3E9nJiC+3d7zLo9kBpNZPfsl/W+3ArRDvyMlThyIxaVXRr6lXPcR3/A2DdNnBWGelXFJJs0E/dBSzAFY/TaItza0lJIK3l3DZcllPZjliVFSbM0p2DQgGWnepVoCsl9CljtKTQlOSOPrcsm1xu6QWREIDmvR7iTK1TCg4Aml7yZxM0qnOYBeTz1SVzfNP4RvNS/SXCLlKuMCcw53g20pr3zrhxBHVoYlYAYOYa9jDYUXrlOgAqMl+tdloBgrQaJ+BeWSVLE3QVRh30FiJ5xTC4XWntWnh/T8YOorTPmBimZ1w8sV1LHnnsjNVxqFDY4q+geRGY0G8MIPXuobdJTQxzSSulNQffB2gZ4gdGTh4Tt8m/t8Wzd+GRXfJ7igV4Hx9kFZHxGyOzhAjir2N52P6SHp2JvJ4EYPnPVRn9keCehgyiMtwRGn8KfzkMXDXZvEHqwHTxZc/1v/6ECZy6evW5NSsGkQdGJfmReON8w8GptJP9Nu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ALwAiFzGGvK/fbIoip3OwsDBu7aTmEhTvflaKGW6WiDWvw/dxgT6Cxse/rtrzCJVyG5dVHGCXb2NMwGvwfiytM3k6wglDpnt5IgtN+eQyTxkq1PclY0IW3N8yyaKlJ51s2jmJCbh9n9mLUX/EMIZK5gMUWj20EWKBd50h1iEFhLMLNx6WYUrw0e6+kBESyZ9lAsWN88dZKzwpsbeoQ16QNomRdIFGaDbbTrH33CtgJzFvdsOwXKhNrhyr9z/jHgE64d6agorxRROg7lctDL7YDSxer/4ZbGH8YaVkHuWtmNmH3a1O/pdSFLb7UL6HLfabD6+gMZ0FwL2SKobTVaLF7vC8NZWQtXuMXJ9SP3LuXH1QqPnngLWyrTxsumqGGjvsxf3eBvey+GRKWl7kfGI33bOTfWWkc37/DAF8yN/ISDCjnK2YKnjYAz3uF6mU0dTM9jueXYIZFf6gCR5ubbC7AgDNWDotON0L0U2yIxAb2B4IIpItHIqScuClP+xcXpK8kXfX0/Q2bSKjoc0uqjiWE26RZBsOSdjcFlMNaT7uyNiCRd00dvmE90i0Shg5Gfn8fotUad2fLxcDxAz7qqYLyCRgBLqKT+XQ7lhO0V0pJYNBb2UoZaJZbDDmVSmFqjHteI4DFhVfV+opcndoov4kdc77CVYWq/syiCG6oLmcCRooIcrIdzn5MFoRA6tbonIF/Vk4nfiv3j22F2IimnIh6PI9RWx29Va1Gc4NKBcB4N6ma/4ZO7Ub5PxFhWbXrcnTh20iUEe7520bnHkBh+0U5AV834iwCeRxygy56AoK00IbHZRyzPxik1g579H9KvUpphu6ACAHIN3aawssuV3R3tqZUyRCg92Wmy7QpznihRFAwT6NQ/Fe92jA77kbvKhn9V9XVwJa9RiGEwhjZ2bIuvs7nCqY5refQZlrobVaeo0zzURrKgqToiYy+OZD+zYO/RwnBzeMTvL6iJTCo0IAtNhlanR6Cf0+WIpKMgpHHb6pxeKvd2KCG/E1psQDNwozxaT/DG1btZc3Z5Achx2Bvu+snqwAVcuPTvnOz7+EcqE8oadOQLQOPNxZ8QsiTrYclP14VInAmyQ1j/LVa6OSK4CeWBpjDFN39dMH5teZ3uZP10BOxaWEwkkKMlcV47oV+0apEe8dNCL3NL0T7Kxngt1KVtJmG+9VFU+JggVuxTvFiuhzNArnoWop5LvU/hxXDPRmTyn0aNHTmQCerA63Pvj6ehgQydILt/XKWWPxNxg/l5rnHTwCvSCN5hjKAOGcZAe11opO4YJVbdzgtYN7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04ccb2e9-b86c-4856-4ee7-08dc4ce944fe X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2024 16:33:15.0794 (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: DB9P250MB0546 Subject: [FFmpeg-devel] [PATCH 13/13] fftools/ffmpeg_mux_init: Fix double-free on error 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: 3rXpoMHlx4z7 MATCH_PER_STREAM_OPT iterates over all options of a given OptionDef and tests whether they apply to the current stream; if so, they are set to ost->apad, otherwise, the code errors out. If no error happens, ost->apad is av_strdup'ed in order to take ownership of this pointer. But this means that setting it originally was premature, as it leads to double-frees when an error happens lateron. This can simply be reproduced with ffmpeg -filter_complex anullsrc -apad bar -apad:n baz -f null - This is a regression since 83ace80bfd80fcdba2c65fa1d554923ea931d5bd. Fix this by using a temporary variable instead of directly setting ost->apad. Also only strdup the string if it actually is != NULL. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_mux_init.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 818d76acda..83ddb21844 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -832,6 +832,7 @@ static int new_stream_audio(Muxer *mux, const OptionsContext *o, int channels = 0; char *layout = NULL; char *sample_fmt = NULL; + const char *apad = NULL; MATCH_PER_STREAM_OPT(audio_channels, i, channels, oc, st); if (channels) { @@ -854,8 +855,12 @@ static int new_stream_audio(Muxer *mux, const OptionsContext *o, MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st); - MATCH_PER_STREAM_OPT(apad, str, ost->apad, oc, st); - ost->apad = av_strdup(ost->apad); + MATCH_PER_STREAM_OPT(apad, str, apad, oc, st); + if (apad) { + ost->apad = av_strdup(apad); + if (!ost->apad) + return AVERROR(ENOMEM); + } } return 0;