From patchwork Tue Sep 13 19:45:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37905 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp906117pzh; Tue, 13 Sep 2022 12:45:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR75FQG7JXkY5allELGxV8Z2OWhUsbgDw13bWAo2/pjK6Bq4/qXQDwwl9gN5/Upkw7pV4lzk X-Received: by 2002:a17:907:971e:b0:77b:b0f3:6473 with SMTP id jg30-20020a170907971e00b0077bb0f36473mr11272785ejc.754.1663098349676; Tue, 13 Sep 2022 12:45:49 -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 js15-20020a17090797cf00b0073fc454c591si11169264ejc.153.2022.09.13.12.45.48; Tue, 13 Sep 2022 12:45:49 -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=Nz0mJ8qq; 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 68CBA68BA99; Tue, 13 Sep 2022 22:45:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073072.outbound.protection.outlook.com [40.92.73.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F3AB68B94D for ; Tue, 13 Sep 2022 22:45:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YSNVtIyXEtlhW+cthLrrxv94/Cy3Cq/zxqXFvNktheF0+nAQq0sVWXzP7Z8CBNIMk88F1YhRkL3pZmtONS4Fe44tmHD0Y3R6Bb287Q6qnoG5SRmX35a+/L/D0alIW1y4eqpyQy3lP6CCqsekGg4xSx74qdhmyAyf6AcCgKzUXlXMIef1KBdUnMM2AL/F0s/mrSwmYZ9tgwAOEG0p7WxOoI821iT8DXA0nl5l2fBxQZYtp6yCufRtD/yrHslWw5ryANhgqMrM1kp4JcXBO/TkWysstPWsIQGsMM/6WxAI5R7ta4Q+k9DpCNIZAClOUlpUbP7o0GPCQCmzHu6Non4yRA== 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=HrbmX+Gj315NiSGGp1rK4SYoQpxxBcyv7YUTQN+/Y7c=; b=VP7o06WS5zQ/DonJyZkkjp3lL/yUuiOLsmBtBBzuwyIQY5KgTwl9Op29XHN/s1ICojUQ3+NFuJh4gKihWjvBBklW6y11TB1vmLspOb7/r7OV704qelh6liYW5gEGvKkdv1mH4eGF8sMQ90Le8BrXI42ea9cPC5CUbaY1KMeYlP3zOAt8qgtIY2Jc7qJirVuQt4gVPGQgy8mYiuBnIEgKtReUnY7mKj2+HH/OrTWfqBBHTuZbMg28AZROAYPO5+FVLmbmjp0eELX830RGWS1ScEVzn3mGfj2gsj43WjMNEVf4WwfXVU6+ZBHFIdTRwJZsOlFkIXT5iLiwYYfuK1dlKw== 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=HrbmX+Gj315NiSGGp1rK4SYoQpxxBcyv7YUTQN+/Y7c=; b=Nz0mJ8qqJufmzfNyRqecIonR2uBEMpUGVgUDv56suZIbFTHP98IzFP9Ci/+FihUXlSxDHH+0YQ9jllte/tXVAENYUAK16s0gYVmuMAkvPu5ok5+SgEEafWauXxIKBEoP9uK70PeE7FhvjnbxNha+ecxINYZictDx4rhZkHFFjj/6omwc2qYcFQTtPkJFCix1AqMCNg8iuWkyKrhjRMosfKY+vGeWzJU3rjmP6GcZxrGPryy9ZptPOim95K0E/8gRp5eX5/MGfVpd8p2WXpyiTSLKS3R0sc0o1z/Ds0iEPc6HatciMdKUNWwJpgaJHPSk2wOJxV2UjrT4SKJ+V+drww== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0446.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:276::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Tue, 13 Sep 2022 19:45:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Tue, 13 Sep 2022 19:45:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Sep 2022 21:45:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [z3hjaTrH7EP0Gijc9x1JsZcZPgfPSLuVqBBNDFMi8SE=] X-ClientProxiedBy: ZRAP278CA0013.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220913194530.775103-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0446:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d48f770-48bb-40ef-c701-08da95c085d4 X-MS-Exchange-SLBlob-MailProps: V85gaVfRD492Fou76aZV/OCIaSP5Lw9JhUfRx6ZaZld5gJl0z7ifueeNshDrIBz/kPUQS4XOAj9vxLaExOLkVZnmcqUVGqPgFHrV1JrwhMj95uG+vzJRMWYBRWGiTlU+YTXP6+8INM6fgxF9r2qJgl3I23EVr+SjxvwHJjG7e1loeHn5O3DfirExV/vxJg5Vn+yBJyLKpj4qIJ4SMxzKIwH21buYCTJI+B0gYgbBZORE2ech6wpUkGv4SiKNZedHHZGM9fDGbHe3XFI2tmYGlTb05XXvD67FFljxYSSFfQuFy3yePkvEOp8U9EFT7wtHX7ySjjzGURuzsZmFPDKKIRqLa8kMU0WBNA3aYEWHK9FUG8H0Gsc5eaNqAPKVIHtDS6tyciNlCPgM5Ky7ZmNrsFGqMvapz8krChmIrJ9yX/YEkH2fuhU6hgPM5+4HMigu0X5dfJkLK83TdVMIPoGnR+uJ4J7AgLZeuGcU6HO6cpUhwqMb71+S5hK6Teald3iMP0yK/Bsjit5CxWBB1C5mA8uN5NLTACnHVJO5P/M2lCeKjx4jKMKzUJ82TfhMj5axCKDLlhabijo0khZ5VwcjRxFeBYQfKUxcXG+zAbfLn1+PF+M4i5wvOOl74FJLJXwRQEr4UQeOoznLfjSrFH83e4hGcJi2uGsN18F7AjiJqHvjbspe0sh+iOc1ZNIIkFH1M83kSeMX4eXnxty6z8MOqBTOf1Acy4vQVl+FaAPAHtWh5ndA+nOZIHMCK8wvu1zn29+8RIIyZc7rcFHrlcFUB9fBj816vt5uDoVhpeCHNh2yPfSqg6KZi4YvatwXWC0WEo4PD+aXVV1NN700lTyJfg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AmitooDMP1lA3ouvX3WzITKwWDP4kDZ+yayyCz5820Ox/LF8fQuCHvuF4ut9uvOXcgANh5g7GMsiIzHh6QLamdUmY7wKfud7el96UZDVJcDqAtdJLo6vEMC/XyTIkr3HmX7KoJpQYR1SnaiJ8FpDSYF6GZ6EzsADXdvrVA8/y3m8Q7Z1wB3dCzcfWryk6LfCTvXO6Cc9abocyYtqft0yAdzt2jKh/AqRnS55xquGXRtuPdntjFPbgud/hXsH7WkBQne/ccnxNyb4ciCWSLPkthPMI0Z6PXx+oDZ1bIPUuqL1cC7sJijq8FGLsU4mCNwKDwczZxSyE6TokCbTbqGIGVWAMfN4QToE1J3tDagY4AXjfdLRewWOkfWWWghridxeW0UWUeTDuDsRCzN3nga6lrFg/bLz2xHSh+oR8nbZ8/Ksq3sinxYP4iS6/Wl6ViCt6vuaE7BaBUjUhHIqQzWVxKW37Ve++dG8JRPdcFQ8d0fViWND2o1rdDjL/CdJC5cz5HNcFFP1Cl8Osnn6HEb9lgAhxuULSgGemUDnYlhBbWfhM/mih3e8yaQL2/Cw8R6Yjel7jqGXijfSmvvn2p60G/60IW6nfXODXr7q6ZL2tuzUnphOp/wdc/xhy3MMK0L9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T9F0S3Hus4peKhTnxcxupe9BrBGkAjM3k8mjtZS0xmK1gkXYi3MhbwUoQyujeLrI2T3PDO1DBhnQwHYNMa0b+pi/Wk9RAG1GPxs6E+7wqSqIGJBQn0Vm4kvUVnp43fc/iJA9l9T2DZrPD/Z0n4G7YSIvYDKE9iyhpkkGw63DsavJrJNkPBqVyN5M4BoIjQZBJFIhW6loQRZY6kgf/LP48vYPuNMmhZGGdpuVaBQZBeLuqe5f5UjHXr+mh9FXguAnpcH/lJltJ2cGZ9n20DT7FMoBL36qkWsjtT+JxgoS9zQ7JV5e6xNfjrK9HboPkhQ+KFEfaUk03+mdjGvQTBWTgXHDG1kDJl0L55BDUVsefJOjkAuoo9IEgWRCBCWpPNPhEva/lm35U5Noyjq+M2rlkRNMu9fxcIKhgv1vkz6SK7Bo77sDarOHh30gscaM6BDb7nFNCJ0ndNFDlsTLobjij03c5/bKxoITpOPk/2/bL+ugFRAXS6B5tmMjqRjHTcMtGzbyVPSpl7+hhQ2GyfeOswgEpk/Yuo3JtvMH4EVDxynjUMvs/Bs/6UMlh6xCiQfiisFiDaOxIjM0gn7CFMalvAdhJgnIH8ARZWH5JUh7GF9Ted4nUP4yB2q+dluvHm0JtA3YeYU/3J6JjC2CA1xD0h/kcTbxMbJClrzjo0ggY2hGnvsHgXeALs/AIxBsLTc4uHmakuxNvZ94OZIypP22n3ajB8B9yK68p6YyS9+/xyOmDyX61492PTSutvWOVwqQAUwEG+Ir3a3BUsWoD/nMbDVZpgGsuQkg2r/cTj4nOiUo/hBPv0KeG5xtckHCmevB/LSmFlK1OwcT7dFvnKJ9OAxIOG2omeu+N4iKtiOTVWMUS3Uf1kSFtrtIPaG6+UD3knmuyE/216OtsL4tHBV1H8lOxLKShQ5GK622PEyHI50nROgWlLwn5uBO6CLesFi1GViu5Vh4n7eOuTzRdIC7k1PTm0lvomodAd0K0NoOlWcdUOmsNoCjghXNGFxxNeFJHdJ+FYjEgFczqfQgfWu8YdGIhUiNhdML8UEh8t9/PkeYRyaZu/OnfrTP87P/vDZ9puzTZKm9WIfC0gyJobxRgDqXjy4dh7Ar3PTOP1pkmruPSY1FPJ527s77S+LrOVUoySiqZ/xPiGfK2w9pT3wfsFqnZHzD1O1RZ2v3YBI7noHPAVqSKKgNM0afJ5faoTRaCUn+EUFMcA8EiAKaQiF/DAQwtuagX3w7uwoCgBTc9foareC7+rzUNBu7N9hIrtaILjAQE2x7N0oMNy7xlDQUr2N8E3jmcDGLHAuyYez3/qq+tzbd2uRJ9XLiQR/Wneks X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d48f770-48bb-40ef-c701-08da95c085d4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 19:45:34.0419 (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: PAXP250MB0446 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/dict: Fix memleak when using AV_DICT_APPEND 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: AhxYuj8zv0sF If a key already exists in an AVDictionary and the AV_DICT_APPEND flag is set, the old entry is at first discarded from the dictionary, but a pointer to the value is kept. Lateron enough memory to store the appended string is allocated; should this allocation fail, the old string is not freed and hence leaks. This commit changes this by moving creating the combined value to an earlier point in the function, which also ensures that the AVDictionaty is unchanged in case of errors. Signed-off-by: Andreas Rheinhardt --- This is an improved version of https://patchwork.ffmpeg.org/project/ffmpeg/patch/20191111011259.27313-1-andreas.rheinhardt@gmail.com/ libavutil/dict.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/libavutil/dict.c b/libavutil/dict.c index a4f638a1fc..c01165634e 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -73,7 +73,7 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, { AVDictionary *m = *pm; AVDictionaryEntry *tag = NULL; - char *oldval = NULL, *copy_key = NULL, *copy_value = NULL; + char *copy_key = NULL, *copy_value = NULL; if (!(flags & AV_DICT_MULTIKEY)) { tag = av_dict_get(m, key, NULL, flags); @@ -97,10 +97,17 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, av_free(copy_value); return 0; } - if (flags & AV_DICT_APPEND) - oldval = tag->value; - else - av_free(tag->value); + if (copy_value && flags & AV_DICT_APPEND) { + size_t len = strlen(tag->value) + strlen(copy_value) + 1; + char *newval = av_mallocz(len); + if (!newval) + goto err_out; + av_strlcat(newval, tag->value, len); + av_strlcat(newval, copy_value, len); + av_freep(©_value); + copy_value = newval; + } + av_free(tag->value); av_free(tag->key); *tag = m->elems[--m->count]; } else if (copy_value) { @@ -113,17 +120,6 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, if (copy_value) { m->elems[m->count].key = copy_key; m->elems[m->count].value = copy_value; - if (oldval && flags & AV_DICT_APPEND) { - size_t len = strlen(oldval) + strlen(copy_value) + 1; - char *newval = av_mallocz(len); - if (!newval) - goto err_out; - av_strlcat(newval, oldval, len); - av_freep(&oldval); - av_strlcat(newval, copy_value, len); - m->elems[m->count].value = newval; - av_freep(©_value); - } m->count++; } else { av_freep(©_key);