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 A23F348B88 for ; Thu, 7 Mar 2024 08:13:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42CA068CEC4; Thu, 7 Mar 2024 10:13:11 +0200 (EET) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2022.outbound.protection.outlook.com [40.92.58.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59E5368CC90 for ; Thu, 7 Mar 2024 10:13:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GhSi12dgxhMAKkV0wV66C6C2QtRlbZGm4G2eXKzPmsZaSDVs3uIq3V0w0NsviZVou5hjqw/k3DWUVCSztb9dSjglBT+HLzmrO2t0/Fi5zyNOKjTs0b3OPa5zvxtg/BAE1kqDT60aODsyZ5hFIwV67pN2DKelFKJPknc3gfoAC8JqSoeLJP2opli1hkGoAQ2/eP9GvHYIMGNf5DBaFYVGQegeZr2sUbYpTsoS3K7RVsQoG9wUbT4emaZU8Bc5e8VVROC5jnzf2W8C3f0ocT0fuG7S94+AoLbEBGkErnBIy/+OsexKIyimkdGHgp7McfZrC14uyYFuiM/ZifoXfm1BiA== 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=Mufdto5TvbK+hI30EGULPFtuPfuTz1EB2ECXtWR4kog=; b=AlkDwPaRTMWkMfyAH+2cLUeoo1hjUR3YimbuPYCjDom/gLGTe78YzU8AiDHsUnl5b/ceuC3AREks4c97vOJr3sl+ByB9tMecGC7VwSh+7V9VN6cKot8hfbtJ5wdiXyDEyinIwCig0lD27Jta9X6ww5IoFCdsCfrvsUzRxWRKOp9a2VgVi4m4qND9KVbMKuuJRrh2ChdGw69ETsJelnnhMstsqgYuvb5CAYNSFTnzEuw5L7Pv+QfN/1uD3Pj/5HJgdJV9aoSAmIOb5OxB5C5b4HiApsOiB9ay9kox/2wwpGTc4NekEurvwh5dbbXudFwOlCH7491lmkANWcd1p67lgQ== 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=Mufdto5TvbK+hI30EGULPFtuPfuTz1EB2ECXtWR4kog=; b=qTCcawCorcnkCjnZLLLlrq/jQSA3iw4tPVI5nh0WDCI0Onee0ATYC9qT/xg4b8ydbz3Ib5Kp4NtShXEXEiuM7B6DRE2hsltWMU/s5jzJ2zHce7qEYLEknniXZXER27X+cMJDgqLTIl1cpDy5RRFLYyTczxmbi4Gqau3IjHf49hmk/kJRaJ+I527ouxGx6YTxkr8jPPsQ3fHh8YancP/u0OX04pAO448sU6vLX0LRfLBaEWBor0I+wDxSCSlW4AySd/QHEU9UIgZCp96N24vgriRPFvj4yB4cgyk1+MOQwdvkpSU0R7tAs4RI5AY6FX0HSbosKeS3Iks6uj14Oxry3A== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by AM8P250MB0170.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:321::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24; Thu, 7 Mar 2024 08:13:06 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Thu, 7 Mar 2024 08:13:06 +0000 Message-ID: Date: Thu, 7 Mar 2024 09:13:06 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [xy5fhLZFjqH6jJltTao0LM5XFee8hqsfAYAPs5zAfI0=] X-ClientProxiedBy: ZR0P278CA0105.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::20) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <4410a3bb-6038-4e63-90e4-3606dc1d6442@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|AM8P250MB0170:EE_ X-MS-Office365-Filtering-Correlation-Id: b25bafdb-2c4c-490a-511f-08dc3e7e6b56 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ykz2KMtciL7ly51gev9rEpvSznEkzMLhc3fMXqg+uJPbwbnAHxKbpLa6d01lS3juRGNbYq39qBBr0kW+z/+mekZh3r0JY9pwAiB1VFVwwU9+qwA5c7zgPTUE2znCPmO9I46ZV/WoMOSnE/vYU9QtmHUzZacDaxMHBU8Kz6fH2bqvzCE/D8mEbqzlwNg/4pv3Rlsbp3jRTkDMCkh8hePSKyotoPRz6suOQp0op94njNh2/UaQSgCmSbEeLDb5MTW21r6D5fMImTqSPqT22cW2IYrKn/ynNnDIlQFOkjX3QMOEyorGs9v9fSi1u8mT+vVc4AWBiX7Xp76i2OP5sLZ4tRQu93yt0Up8opAcbagQavkxzQB6LG0gP0G+6BL2tQTkOaqzAtBgIMgxdhYj6fO0FO4qKNUvsDAv4z+CYgq/W0JKmeSuPN1gpfNr1Au6aVhDnWfuifGJv4CN0MEiSHmUjj1t306lplp/u1weLnfC/ynJN2ts+FrjwEN5rFkHgKY8FLxdj+lf7AbUXmGCeQ9tdG2kXv0mqqFoX95sp1tVhZlLxCeaGAUCYVNHeEciCvTs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QTM1Rkd6bzBsTlVJOTRSU2pUTmNiVTdJVGF1cXN0LzNQdldJY3FqbGxZNXBx?= =?utf-8?B?cHF4MTUvV3IxUlJHVklFL3NjMkJVSWEwSXFXVjFxNGllVUlJR1lsK1lUalov?= =?utf-8?B?RHp0SmtLRHJzaytWcDRNVVExcnJFejFFS1RYWUJmMzhvR2QxYXhpdVp0K0lY?= =?utf-8?B?TW5qdFR3ajNEQ2FaSXppemZRUkZHWjlQZXh0QWU4Vks4d0hrR2EvR0N2THdN?= =?utf-8?B?b3cxcXVXNVljc3lkN0J3cFl5bmZEVTR5aUZaZXdTcnJ1czkvYXlRNDYwRklr?= =?utf-8?B?TCt2ZnBLWkszc3ZsZ0dGRkhhbUZpZDBLeUFock0wQVJkb05BRTBraGQ0eGlY?= =?utf-8?B?dWxjVndIN3hOZFVOZG5xbzJQTVdyaXpJQ3FaOG9ndGx4YXU3bVdkYkFSTUcx?= =?utf-8?B?bnFxWkhQdlJMSTNYeGJWVTlKeVh6czBGNHovcDUvVWRYbXBlaUJycWlKY3Rx?= =?utf-8?B?Mm5kYi9UTHd5MUxQZnBsN3VzZ0lTVVB2OE1iT0xob1ZCQ2kzemVZU0x3Yjcv?= =?utf-8?B?VUxQMkRDK1laV2dUWWprUERaTmJIa2l5NjdkL2hTVmx4OE5rWmQ2dUhJb0U2?= =?utf-8?B?OXVuNE9PdS9nRXVEN1krRmdYNnFZZnRDcGR0Q0dsV2s3T0ZvVUt5NG1pWjRz?= =?utf-8?B?aVBvTkFqbkNqRFp1NTRwZVhaL0wrUzNsQlk2YThkenBJWGxEcG1mN21acjhC?= =?utf-8?B?VjRmRVgyMmY2VjlOa0FYQVRRTkozbzFKTXkyTUZYSEdUL04wOC94UGx6Q0N3?= =?utf-8?B?MTJwR3doRHRIYWtNTVN5cGdINFlPdTMxcnNRNFlaUlY3LzFPNWlDUVBXWkJI?= =?utf-8?B?SjNVamhzVnlkTlhFK1FjMUp0b3prODRabDhjYlVaNmRveHYxL1J4TFcrU3pa?= =?utf-8?B?STAvSHZDR2JqQUZiMDNZL2ptSThYTmh3MHRYLzFJeWppc1I3cWtSU0dNZU53?= =?utf-8?B?N1ZTSEI5bXBjRzZXaU9tSnBuRkpKdG9YaStHRXNjWFNhWFdVdnFQZTNsWVVu?= =?utf-8?B?L3pjb2JYZG10NVdlOUs1cExZYWRTOWxIMVIyWDNmalFTcVhZaVJISGtyTUFa?= =?utf-8?B?emZPelcxd1JaV2JHbkpuM1ZtdGU2bTRNWGhqbHloTjZwRjZOOVVzTWk3UnA5?= =?utf-8?B?K2hHK3JQSUo2MUlabzBHWDBvM0d1Tkt6YzdSRTloM1E0T295cGg3eDVCd0hw?= =?utf-8?B?Q0dyY3ZlWkFjTHQ4d0hZMnVhQ3NJdFBpUVdrVzd3NlRrakFGSldlNm9oSkVz?= =?utf-8?B?dDAwalFZMFBiUC8rZzIyTVo4eEl0OStsRDBiekp0aktiWjB1MFd2a3F6aGpv?= =?utf-8?B?MkliajJweHhsZWxNQ3d2Q05HaFNRSlZiTDE2Y2tkY1ZUZXRGYTJDNW1rU1FU?= =?utf-8?B?N3FrY2h5SXFRcnptVTVFaUdpdFl0S1hvR1RwMGp3YTRsVy95bVhndy9MUE1E?= =?utf-8?B?ZFBLZ0M1RE9JZExXUWUrQ0JwdUlyQ0FtbVFNcXh0cGd5ckJmb0hiVEI2Wm9J?= =?utf-8?B?K0Ezd0hTVmJLekFEM1lrRVVYTE5nSmcxaUNkSGQ1L2dwdCs1WVZhYisrR3lQ?= =?utf-8?B?MFZvbUcrZ01pUmtPMThTR2xHQUFobjQxYnBTaFBKckNSL3Y2T3N4VnhKbEVR?= =?utf-8?B?UGpHYTNNTmVFamM1U1EzQndTdE9kdlpQcnU5WFdxOUZpaUhNRmhVcTRxMXNJ?= =?utf-8?B?bThleTQ4RkxNdklGR3k5V3dHanJjNGpESDZ3ZkFJZVlqS2U4K3cvSGtnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b25bafdb-2c4c-490a-511f-08dc3e7e6b56 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 08:13:06.8954 (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: AM8P250MB0170 Subject: Re: [FFmpeg-devel] [PATCH] avutil/dict: Deduplicate freeing dictionary 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 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: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavutil/dict.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/libavutil/dict.c b/libavutil/dict.c > index 7f23d5336a..6fb09399ba 100644 > --- a/libavutil/dict.c > +++ b/libavutil/dict.c > @@ -145,11 +145,8 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, > m->elems[m->count].value = copy_value; > m->count++; > } else { > - if (!m->count) { > - av_freep(&m->elems); > - av_freep(pm); > - } > - av_freep(©_key); > + err = 0; > + goto end; > } > > return 0; > @@ -157,12 +154,13 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, > enomem: > err = AVERROR(ENOMEM); > err_out: > + av_free(copy_value); > +end: > if (m && !m->count) { > av_freep(&m->elems); > av_freep(pm); > } > av_free(copy_key); > - av_free(copy_value); > return err; > } > Will apply this patch tomorrow unless there are objections. - Andreas _______________________________________________ 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".