From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 217D046F20 for ; Sat, 22 Jul 2023 19:10:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5771768C5C5; Sat, 22 Jul 2023 22:10:33 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2090.outbound.protection.outlook.com [40.92.59.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3028768BFFD for ; Sat, 22 Jul 2023 22:10:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P6T7M2l0owuJlF/9l7YfUS42p1p9BMLuVxAaznbtatbj5nZWUWW91ryW+QIckus96hg7PuYC1yhN0RtNu/Liz8vwHFSb6FLGrBeCsugco6LRPh1Wu6KXYwTBs3h0lYug+eqYJa5KFRAZXKcs77kkdGwJhrr2uNDuwFE7jYUGHnPKHK8uF514DM6iSqZZWDjgDFhF2VAF8lJ2I9BhFywsOzXBZMklogp1yr48FSK63SnaVOnfLlpMqwdv7N8Q2k4dHggLA+/YGKsfy3V1Sehg4mxwPFxzGuNn5/leTzzfUxVIYtCthhM1mCqj0JmMCThCuFflriHn2KJwWtMSXG/7IQ== 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=Dph+/d7TV79NH7KPaXnyoTr09v17e/MskjMU/YlQnqg=; b=aRl6r+SL2FTBpkag4rK2cvFAV2jyx6tfZBke0hgGg1s8r0qf8v2uxCiSdLllbp/91stZbKTeJ0rgU/jJXWFxQa8/MZeKukwjPTCTeQhUzLoYuxVZGulALIouuIiUBhFF2B/Jemkrs0goIgHlBQaHkt5nRpWrEdw2WSPWGffkDHvui2tscVfjiOZL3RZJ6/6M/j2al+qSRkcrs2oGVnZy8s1ZKl0S0FwFuIi7UGwhpk2iyHO6iVbQCjYNaeIgkDJDS8nMQz/0xwywDXuxwPmKKPSSnGJrhlG60cvDWniHXZe9YrFmi63cvh9dK91mBXd1FzWdW87aGxLkl0cqzTYP4Q== 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=Dph+/d7TV79NH7KPaXnyoTr09v17e/MskjMU/YlQnqg=; b=oXv7VmPwT7g43CtYl1QqYGnaF0QA5QakRYGCJ8IqE3gKm5uDptRxzz6OhLudU8u5MKBiED+o16Nm9YxoojlYnAEyNIE+LdmpQzRUlmQgfaY+KwaDy8i8GmY2ZZmoFEISEqEW/AYqtOLm7JOqzX6Melsw6s1IN/jgkEfVOEU5p9M+GVquwy6GVsf9DwqZc3lSwbdT2E+PpnkexBdrfhfr6H4em+5vslXixLTH9jOYLO8xmxy23ikn9WkSMMvGYVUwKXLgPFyS52e9sKzMqZb0wWC6/EmhHkeMT6VodJvLiXJVS5cHDtdm/qqD3HZU1cyzh076EuFgPmnEvPbmGV+HaA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0218.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:379::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.30; Sat, 22 Jul 2023 19:10:25 +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.6609.029; Sat, 22 Jul 2023 19:10:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jul 2023 21:11:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sAOYIu3UQTNk71Tb7fSIwEGvkGW4acrM] X-ClientProxiedBy: ZR2P278CA0049.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230722191130.1251075-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0218:EE_ X-MS-Office365-Filtering-Correlation-Id: a0a982d6-b815-47e0-4518-08db8ae74e23 X-MS-Exchange-SLBlob-MailProps: Vs63Iqe4sQkTevINwjM85X8G/4lo199OItoGWXO6prDf9JFMSQBk8PX/af4tdrOQ+2vE11r1cZr3VUhSQP3SQBnhstynI9oPX02MS58yN+6ezuyJVfxh69aFzF0SVS03Sbaunrtp0CP3Ncfl4euBlbBfaFBwIfFI5QWfNrb8rkNGfyDCJL4PUAM0qaLYkqTudQmN4yUt1D09MKqIVxz6/bDwkuY8M7Gnt7ywrVqoj8dLWkh6bgW+WU2G5dmYq9ELytBxPiAtTkWoGJfPPeMfe+sWDFxTwRWdgl5/OVa8QIUq02t3h+sRjHr0BUTAA+B7k7gdIF7jzBUoMbEQyXgawdXVKu+WiqfQ3GAlf9y3Z8zl4NCfp0PoNJuQKhmQlyVhr78LIZcMbS00YygVsCKKcWeyW1yPkf+BJewDES4FFB3eesxmubrVUKtn6Z8jgLn2/Nhu/G9Yq7IeJ1JDB3A3W/bmuFQnp8Y70yQQQMOHxyPUtfeXtbQ3ca7C1UdWYVE6ZLWEH7IcRQhR06M/xiE2T1OJ+NLWHN2s0EzW7chKDH6v/WENx0Q3suntMTJ6iG5mONu9eCV/5NWOvq/P7f+4ab1/mykVoC/km5h3gZq3D/LSTkGfk8OYV0h7WU2ya3FJvChPPmS8T6PQYEpW8GB7kR+kP9STlHGRYjXxFg0K4ELk72onxueaTKkH+OPqTryTIroo0dyD6NzKa6DRXIhqY0hyd5qFXHRmmJWj5vKPYG0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xXVOVoiJtEq6yLmgRu9u74QFkIVNKw0YBhtu53LnI0q+dc58Qso/MRgFn7Doh/2DnOqfRVR9RcFq+/E+qnF5B05szeBN1FJSRUUmmZe+kubpleZdvo97infBqODUgRA1CkPlDRC2cZS0F5gaNB5Sq3fpll3NEfEAyerzIYBbLmk5NGF9o1GutxeKJMJWCDgrEDyhwpEdg3WsQjJ2SbwBoutgKzZnhkgbbR6oADMzxwUJNsiJYHFaTHPtdT3v1/80w48TpsUP7M9hAGupGKSxs2nCai7z48NaXar2OUjHmASN5xYMFqJNefabHW5UJ3bGvZH475r7lx2DHvHJgAaZD/nMRHAW9CoXubAw4dQHXA8G5I3PmaxqvHOHagypZpp79LFOrAYnz8m1oeP9+6VUoo8eZbCjVP9VV84UfQgokzze1dJ6EZI6vMLYEwZC7nQiy/Gd0lDPMnZEMq4E7THb4yMM2r1oVMS4qtF/j5pkZpA4LRPSLvADBITje0XDpy4OmIBTY89wGb0hdzCbuheCllaocv3DGDQt7IFDbJ5OOJLzMz892z2Gxu8O4pqrd1daaI1yRJXIEPnunEQUZ0oTzfZLcl2itL+itKSNx9IMgeEfm2XYrO1OUIxmw72vag1j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qaG/FVKVvBvyuJBfB14oHoupmd0Ht4KCFPQT1mzypFwrd69GvIh9N1PuBSdc?= =?us-ascii?Q?K/IRkR1um+etDRiuK1iYtyBToIjNNOsPPxNf7B+ANsTfJGC42Jvi6lIg6kwe?= =?us-ascii?Q?yEFLoBfbUKyObJnhahmThF0f8lCCa1BkassCTRnMLJsJFZxH7jX4SNiykY7f?= =?us-ascii?Q?jsC1LFP9LfQE0Z55X6q+41VSlPuMwAxKv1hDrlHI07GTjcyzhUI45JVE//MR?= =?us-ascii?Q?JEgI94mrXSpgWSKybl0H/i7yBjbLQNbYIcyq05SMiVw+i4m07In9vys+3u7/?= =?us-ascii?Q?g2koBQZnocrIQpt3YZH7MHcyv3tquNb77d7siCzKBsY5xjWIGWY1QuN13L13?= =?us-ascii?Q?vNuWCTP5eFHWC8hx+SsW3E3Djy4buB0RtI5icfde7sumwkey2hei06/QKmRU?= =?us-ascii?Q?s+c5uD+7bu0aZeSZcRDWREIVk1KEaomNNs6bgdKbr1n5ghyW/s39GESEV4K7?= =?us-ascii?Q?eCaxtdPLGWEl1lqjcyHflc4jxsIGC7PMIaT4mhFdtETEznpmnnf2eFPblww/?= =?us-ascii?Q?EsmBj+WRBiJp5L9SLXcbed67iTqeXd3EsZ6JJyXFy66YI9JMNhYxRZRsNHcF?= =?us-ascii?Q?6RjZ7HnYuNXfcoo77rnBysmEhFzp90OhB8pQVgIKzK3f3w4FqqPfq7KR3Rjq?= =?us-ascii?Q?53mVCzC/gJfhmg7bpAvSvHis6qE+nq2yCka70u6lJpEBucM4sk/b71S65iCG?= =?us-ascii?Q?a4+6aBHHc68+dxVTMT9RqHHT/OObjcoN3/vtodqNTZ3Nz1hZUmuHSrjuNtU1?= =?us-ascii?Q?D8rlMYxZHc3i0jV7q2/H8XDifi6ZfrOUabEjbWiC6G7moxrh+LdrHH0sbAad?= =?us-ascii?Q?Rfqiu4wrRxzSWecIlYRy5e5u+/7E4hpYIESGZCuPgUuptUIvt/NSNNUNk3IH?= =?us-ascii?Q?HxtESVE8UUujOQvhackUp2YDy8OFnT8RQi+FI6w17N/Bp9PmlcYw9E9MGSB/?= =?us-ascii?Q?O9t/Xm+I3TVJgb6XQwb+jrecv5U9VYzLfsn8a3HKuR6nF59SHd5VDl2PFJdw?= =?us-ascii?Q?n8EQew9PO5tv0LUZpxAT4mL6kcJm+3G/r6Ad/bMWnoS81DBVCp15e1+00Eor?= =?us-ascii?Q?VzAA1B1/dCvWOMCmr/Os/f747TfE+ZL2wMnt1hDqE1St0eZF607ozQwDonFC?= =?us-ascii?Q?RgxuAxLAYH+1YZDeDFGeN+d2QQjrkt+Dh/n4b4bDXEAKsAwqZbIXdBX58I73?= =?us-ascii?Q?zEyYQnlDT0iJhgCYoDCNT8xsgZr0WixehDBQnIkqwYmfyJYdshbuX0rYLG3S?= =?us-ascii?Q?uET4kV7HkohPIajeBo5G?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0a982d6-b815-47e0-4518-08db8ae74e23 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2023 19:10:25.8540 (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: AS8P250MB0218 Subject: [FFmpeg-devel] [PATCH 2/5] fftools/ffmpeg_opt: Fix leak 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes Coverity issue #1539097. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 700db706a1..f7606ae6f6 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -497,7 +497,7 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) ret = GROW_ARRAY(o->audio_channel_maps, o->nb_audio_channel_maps); if (ret < 0) - return ret; + goto end; m = &o->audio_channel_maps[o->nb_audio_channel_maps - 1]; @@ -559,11 +559,13 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) } } + ret = 0; +end: av_free(mapchan); - return 0; + return ret; fail: - av_free(mapchan); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto end; } #endif -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".