From patchwork Tue Mar 5 15:53:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3944:b0:19e:cdac:8cce with SMTP id ac4csp487233pzc; Tue, 5 Mar 2024 07:54:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU9UwxrgmmZNdmq4YnG9EK6gPoVGlZnvM0txgR2KmKUcIZULbTtDJJ3cxQvv88ZAOp5/V0fJa2XkjDXkVrwTroNFTcExqrM/e4Orw== X-Google-Smtp-Source: AGHT+IEgSVfTRgmbXFh1WLDBK/iaapK/dfaWZ7B0nrinGqGiS9HydbCclMIfm4AZlR5c74UcLi1A X-Received: by 2002:a50:9993:0:b0:566:414d:d70e with SMTP id m19-20020a509993000000b00566414dd70emr9762814edb.39.1709654057027; Tue, 05 Mar 2024 07:54:17 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i5-20020a05640242c500b005655ce1074esi5356571edc.159.2024.03.05.07.54.16; Tue, 05 Mar 2024 07:54:17 -0800 (PST) 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=dBoLQSva; 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 BC0AC68D098; Tue, 5 Mar 2024 17:54:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2039.outbound.protection.outlook.com [40.92.59.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F037E68BFFF for ; Tue, 5 Mar 2024 17:54:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RlgXqJwaKP3K5KDogHZoNe8fZ3knQKPxpHCwUy7paXpe2BezINbs2zRid2HZtm7xZn8P/B8mdMR720SAo1Vw+Le1wCcgVXXF5VRN7g6V+iS+sUppSxRS5HRrEVBBw7hHQwHQ6kJHMm//UldT03Hu/QLvnzgjFA/JBzZY9HTBf857GEl7t+RU7ar8nk3OTHq4HAsLI4AjtxjbciTIYxeH0hyn9dgNwppKnZUSMT3gk9Kk6VJKTtCMXBOCrS45qHZhAh/SAEh7+bhlFg8EjWfUmbemzpeyZw1d3aa8+xd2px6ZQykxVxgwmHo4tighjFNtfRp4nqCe+CHtxpStiu5SOg== 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=Yu4qbe1zOMjzuonuquhyZJENG7M52WF9RilJprIXTVs=; b=bPSPzHD5SlhKfD33qNmD7nPijgwGAqYgiT4m1MrOOE23LPOejn3Pfn5cXRGjlqh7+BxPhHslDWlg7w9yfONpsQ8RmPaCW12sSDJL43+UIIz12rK2N52u74H93BJRotdFgyriS6Fh2SwnB5C09cREWuU+n3UwhBrC2KnpDv50a+pRSTxdIDogs6iJFAocnd2W4az69lA10Ejf7b26WD9fW1dDLAO8IeiuYjkGJH2wMrMdGPjzptz8i1YXMav8SDMDBcnpdGV7+118htw/MwQWVklbBumZqueA+ukBXCkqGpslr4BYdP+ep2k07g2mHCdv9coCglrDJPv+UKLNK4PTLQ== 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=Yu4qbe1zOMjzuonuquhyZJENG7M52WF9RilJprIXTVs=; b=dBoLQSva7fA+c5ScQf6uQRwl+fFJIRcMhlarUh/g7Q0DdIL399upARGJP9sxv/8OcdsnYQeSfX/Xg4pGnN1vXJ2WD9i6em49WzKg9EB6BHvyQxk92w0rrvObyM5Koro8E6MHL0d936pRV4Du/+MWvhGTGoA75fo/KzogZYCaSCusDxg5GqyGUOJuUYDla+Mw7CQSPw+yv/pviYAOdZWIg69RIdtfM2ewE7FCN5M5VHDOqfHafmgShlTxDaXYP/AhrFjaAnKp1Zf3YWtwafEtqTy/kKJChxugvueor6olbi+5dWivfg8aSFB9M9YqkOkTUxc4xnCGLLBWgch6aByWtw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0229.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 15:54:06 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Tue, 5 Mar 2024 15:54:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2024 16:53:59 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [ulV9zPPv5Bst6nsm0LyALid7e8tX3o+pjSBnRyYbKNY=] X-ClientProxiedBy: ZR0P278CA0157.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240305155359.2740827-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0229:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a09355f-7a9c-46f0-9513-08dc3d2c7cc8 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqePc+++EJYXChPYIkmRnV7TXazzd7XW4M5nlAxR654deeesd4xl60WWL+AfShTJM1DrXaVgKNDXSjikpEsnIkDAfiSJmfGBBAgNwB4eVewr71KzzysHA8iPJbpcTqi31esO01u7QiBG6yXokGz6Zc2CMIExZF5iBSN5fkMuYSh2ai/47E9TweW0QRLranj+TCQ7IeQ1YxMLMoI27qAL1zfEqgSpkE8lnDDZFyenJmsJzsxKgDhRpgSiM+BWl2lCVDk8GWSafPTS0ahm+wfyxOT29++Cbib0vbN94fJHW0kkUk5PpseFkGD2EzSMBKH2DbegAm4nSHc9seMlUG5ITRf264OFKzbmMQ62F+YZhsw51WXkiwPhSdabJBJgiLjnDrk/+jMBTuM17WZWnrNU0n4Wn3jUm4+L0MFmZo7bRwtCC1/h8mV5HnPGa2grGcU6jx9MopJGixVbzuMX2yzeW/aStv9lKs4w4nx0kV5k7Zwou4kb1RdKuuynZk69GoZca/JN7jNj8uD0gGjPNn0V0xgZ8ElpLRW/FSkFIUHG98r8tQsh1cmUbPk3z98tqhexSny89qWywbW0nEg5jMaiH1maE6l503EXRnsQrkuaoKxYH27V1h2b6HFWc2KyvjKun8hOKqanT75xGBDapXzHGbQWyGmRUxEHfblr6lTPo6qhMvcoRDbrrPNdlHtsfJPtfdajSiNFZ6A0z5UN07KjIEydEuWaTReX38vyAzvE8gCrO/eR1I7OrSa7pR0bJVpfS4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B686b4+Uw66g5yT05O4Hfv8je/x71XsrjX9b3Uj9Zz9SG5iBJaGmmMapjF9XYN8t9vErMFc09M/eNivT2f/SUJPAyQsmzu6MJGkg7+EBlbGK8XI7GA88jm2W2UBaDgxFbXWQDRPQK+oNx50SBwsVcX6XFn+jRFZFRXlRsC0vFk/v993s2FwkN2YzUZkiwmbGFcOQTCcdxTMPOik6mjTjMfs4K6smUeQ0/583SSokAgIlLGZZcfo4Jq19Cx0meU+mJrWNtHJ1GjHlMr2I28jt1OL9ovHO4KNkyJKlvNlnmtePpyXZvYq21V5IV7HDaWTErxIos1FZja9la87mA/2tGc5njfRL8BmKSHR+uuhSjxDgnk0dOmwO9fLylF+Rebyx/GgFtz77Fu0iA+U0IiI5jKP+TYy94eG9avYAHGZM1NKfbEdH9oqXmF51Z5nfvJaPZz2ifZpP96Uc+5aO7egW3eTgzFwapMTblBZ3xew+o9y5CeMUQ0V1unLBHvTMLaejkJGavecaiu805GF9tnTvN09AxbZFa76Y2rtU5S0d+aIc/FPQGHIenQNHcRw+Su4R+0U4TFtrdDNxkoE3uSmoD0ifKolP2jE84CIFBUW6j1Q9DUc1ZrXaWIMC/ih5tQss X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dDLJUOUyivZvVd7Z9B24Yfgse9hHOp7JtFsx0jn46sZmp8UoE6YKdA8iqZ3qY/f+zX5l1gkkvUWSFJGi2A3qAY9gVsKWoHTqGHHTTLAR/ygr8nKtTeX+7gy2nfnPR2kQdTwk/sSvOL68qNsRDnVT5RfJDcqGToAhLRzlCzfbLF2x2CxieFfdipNMbprjjV9I4Zr3DtAjvbFw7AIK7Iq19JRn7mDDNvtXeZZ+fmfc8BnrdMLE+JZJDAMruHQIVFWr8UKHGRnnmLEBUhWaRU6DkXlelCWhzCkQQ2fbq466E71quYifhTiyeol6graYD+EoK6CcDurnPE5Y9NPfokWijSs5qmTNJZ3vy5Kxeh/iAHeiorVdUrb+WQK7ZrNELxBFKzwlGHphpgYBMa7o9gMaDC4AlAZTGAKnci4v3MqdMuvGVoM272hvM7i7z+OBGR9ygdLKoMWV5FZrY907gqYHSJ4jxRIINE8bBSYbbBUGsJ5cAX2ANbFQTrcnk34/Fc6DftoDSlEfneJy996C5SjUyzWrwompzzRpHnFhhqEQkBYRqoU2RKXsTi+PZCPY4gMBu1plMF0hR+qxtMP9ZFfieHta00YWsWhI6fTJ8OpXNzyxBM73did3S5zpTQ28vB9Buj0f8If4XlQ7b3lXbbhGf6HykCwBQ7g1yAdk3sgSp6CDjbNwkUj+1egTTGqX/iC1YgVsUZUUHN0mTLaBfr3yzbb0uqlKrbrgADamqo1xTfYYuyNls52CANUW2n6+Jx9kzlisSnhU8b5dJy58/R/rBVAmI7ajMGo24O/n05Ztn7Bfh0YY5GIBb36PE53cLpaumZ6LER3nfKUb6HJ5zFQD/tq5D4KOQeN4yZ2qW5D/3sIQGx1E1QFTodGFP/SH4zxaeHugVpJfSPOppk2/hPdRe/JAn1YwYJH3DBMjBRSoNpw/Ikc8tXZ5Y8xs+JLEX3JHQ3+EAdpmVvtYkzzKXPBQD6qjV06zLLixSlt2qK+hYSiQbw3OW+IxYUvZCO/zQ/DQgRBZQ9JkbRCIagrGMDsApL1ioraIKosORZzC/5X3jnuhE4ZnMsEjjX77Y7GJPPHg7j++tYboFvfgBU+7dCLKKK0wKEt8ezSdaiY+r1RQcocnV7pjhqzdWtmxHvRK7Ahwsvs6nPKfeAxecDLXikW5T5k7HFnJCIuQGezRvlYXYfd08uQrfwUboLbK81gIHy3zSmSh8GdYbnaeXWk8kxp8WZPnRQfL3GhMyMum1LYCCYghuYtG1tpTxS8T/TXbZOix7iGSCS2OT06EJTzXRUP4yw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a09355f-7a9c-46f0-9513-08dc3d2c7cc8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 15:54:06.3332 (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: AM8P250MB0229 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2ATqFwikDqLM 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; }