From patchwork Thu Jan 20 19:20:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33734 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6166440iog; Thu, 20 Jan 2022 11:36:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQhyhms+OsK3nF/bQFuLhZntuEm8T5sfAemq16v9dx7x29HLZg3N/DsDdl5At0FSa4KSqu X-Received: by 2002:a05:6402:354e:: with SMTP id f14mr645367edd.92.1642707375843; Thu, 20 Jan 2022 11:36:15 -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 hv17si1365358ejc.1007.2022.01.20.11.35.52; Thu, 20 Jan 2022 11:36:15 -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=iPUcNvMT; 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 8254668B1FA; Thu, 20 Jan 2022 21:35:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069026.outbound.protection.outlook.com [40.92.69.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FD9A68B01D for ; Thu, 20 Jan 2022 21:35:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kU5EcirmsOe1xZcOZCdnMka2OUBsC9UUF2wzR3oHIxvHTYe1NS5eUmFMk3d8/lBC218zSiLL7U8alexne2gv8NmufWxmOn1Y2fPEENXiPKAGUdusFgzwR4hXOQ9Q6uPI+J0eD/JnhGfPpBmb5p7hpGaDy7M/3AujMKZhNVEYykwlbd+eug1TBYf8vU47YjSyCZ61lSlA5Wvs6z1YRMWWxStvDoarTs6Z8QTHEeSmyQdtsv0qOA+zRAH/U2DEP2OPTAAj0Giu62TE1TXoN1QVepWYMfnZlPtlg3lzOoBph4C2FttnA6ZP1B7aynim0AVzOXf2/c6cBzXeLyL5c7KBhQ== 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=ea9wNGRvZBiJK7DMmDyiQKrZaaYfS3UXPn4i2+sEIDM=; b=f/HQ1yoPzNtNRCLw1d9gNNvOQhQbUhSSbHEsNeT1A54lVKvwH6fr52TatfM4oM8gjEB9bTCZ2JqNorCRLvxgZnd50RI+dV9ZwHtDPqL/eM4k23sVtwShn+GZsxx6s6GWXaxz0FkriAqzTMOm8FJmnRGiFND6D9WAo8HGaNeZBnzXJnqE0VFwaZ7TuwJYCQnY8dx14KlK2pmIhlaHZ/VcDU8+wHXjLM2UDfKua0VZAm4j6TW3a7mXwPGmP+r9/M9kYJpFzmd7lvIeO5L/zMUVCLgMpvU847Q+JltGPpAh57v56EeQcwsmq2w4awJ5UPoe66gtLsoTQaUYizvyf3yzyA== 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=ea9wNGRvZBiJK7DMmDyiQKrZaaYfS3UXPn4i2+sEIDM=; b=iPUcNvMTOUfoytgSL9XhcpeBpi4pRuXf7+BG92UEL7Dea6JmmKUTLqXjYmSCnWOdeyBi74Yrpke9HLYCG99VvdsGGnZtO9pPse95MqgqoGdgtrYnJqkzZ+awONrpImMQN+e43siZMEQ+K9sLNqXch9GkLv2K3VTZ5R59XWc4xWnEAYLiSJTEVu2M4UwYQsBUJPzfkIgeUFTUgleG0AC2j6wGW2+Ct2wLh9yeWJ2rmTvmFW8svLy+8hPFZgs4UQx65EzNbbbV4A+5tF6BStA0tMTtDDwa0ePMwSDhZ+aF0Mso/+YY8WW1RBwgrNqLJxtFJtRa15CpQfDblrWs6CG5LQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4491.eurprd03.prod.outlook.com (2603:10a6:10:1f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Thu, 20 Jan 2022 19:20:54 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4909.008; Thu, 20 Jan 2022 19:20:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jan 2022 20:20:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [vNwNc/8Mj0ia9ul1yYMWA3oHoosEgjn9] X-ClientProxiedBy: AM6P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:7f::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220120192046.1295549-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5481fbe4-d683-4bd6-2007-08d9dc49fa62 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRo7QrCEuuunV858JU667pSUoXl9B5f92X6ipAufxmh8xyyg+ymvnGHBORrQYORrcmcQkBUb9X5T7IRrY00vPYar/M7yZNs/VGBaDTH4MKbw497U5wWe7IWjRRk6TPJDh7VkcMubnX6PbxmVK3+VgZU7JHbGR/M9HkP/g2syPEWGmlZuBqywGuuVRZ0oaWIwmPZsIEsFfrCPDhnRbAf0c9mBm1rhrq3qC7oyDcqAioxVo7GRfXh4lYb8O6MGWNsCUPoHmVqAL7+dT+lsjXoyzhAuVkwvr3mG2PZ3pIrH+wFR1+REZipAPgduuvgRPkbykLNKpaTLQw8DzMfZjT5jgMwAbp8HWqPzGM6B8odC2PJbHBWOkVUtVIrcV2OAcVEVMJGct3pH0XcrIpUv6Dtm7mO9itoRgXfrLrTWLyODkp68CSnMoF3MIbVWspXK6mtJWfBzRPeTFktwIT9hX2GmxS29h2C9cKQomHxP7M85bwJJxs7UH7wFNGMs+yqAQyfJTttWc2+1S6sOT01WypqGGWiES9Hjon/nMpojNIFH3xO/dWlIW5eEnM2ZK57dccNTDFi5kSYO03dCurWAkE67KMiw7N66cn5Bv9Lx0cCl/wrZR81OE0d6M399GEVgsUXAxdNkRvcIOWACVpsm6trOT5T/Dzuv3tiVap0wvREC9sxxuvOk6bgy808EJ+uy+h13XO+kum9fJJ0QVTCTsCSKaJe63F4Z64UbMLnmVpBiiBMdud+FSYlsQudEgphPRExRRA= X-MS-TrafficTypeDiagnostic: DB7PR03MB4491:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZyjUVQ6QiHBEe3U7+9FZADROTwX7AE+EYg3dNCWv7F0XnpbIeACqZ21SGppZWRQbQ4iGzZQH36D3T6pjy4eNe4/kA/MUPlXk7WgXJAjVyPIRMyfz9JOFd2j6JN7QwzBXXarzZv2op7RUb01cjmEsM/Sne1VVQiGUPJTAjWzG2wCdRCFFHfl62pZDtWrF1bQ8I8oa88ZZEA/3Tj/teU7eT31bw15qYwYlWoPtim301UX06AEjpTY8fy0XMpnHg+GofIJV3d81DxiEuK5p0VpoMcpSx/nolbyXePVfuONobDcOzNTA6Tt8JE2o7MrN7fJSY+brbBAh8PrxDiu1YYGff3f9xzH1724Fwt4q4GpD1CnEYOfg0NMOAfGMge72WTOZzb8daJ1jiRpV+/rNS8ygzvWy76WBXXTafMw/FACf2HF2BVzNoNB5vopBOwbwgeFOc6YrTf68QmEkiUzY3EyFMmdjOPLa6EG9Rg5vpbRvFDithH7gAl7eoRzVm/LYkU2klGO/tS4kzhWj4cl7t7yBIudOiRWqNjM5VHyyQrmjVy9lpAeVV3eWJXZ1SVQ9jOEX+asoH4fSrqxKCCLfh2+mNA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZL9ME7R1lWP4V2eNvu9/AAIqBmHJaPgs9ro8XgZbb3HwkZWu2qH/1BgyO9kUKRgeFRJpbWpTKge0+Pm9GiNwhS/8m9XhZ08s1Z4Lmb8GUbSi9LWbyAjxAyzlW5MPlenDI38CriRaRj/3i3knz2uPvIP9YIDdOzfHIZm+/fV6slvc6KEsOi1e5iw394PyNfni0j4DOZZ9vz+VK9oOcSLVZionR6L6CliVx50OxI3hAu+3c3PNViPeHc/lDzZs/NpJYzuVx+TgtPbyO8vNkWLwUZocEQ6dLyLrWvElMjhtkxJ/1pRXKk9FaDxVXKgQbGor5JU2jZQFv8Ssp96xLGyUmZMYAORK+9Rir4jbxIbwqvjRQUb2TKsrg6toBVmCcDMHchbrclqa4L4KlPm/DL9W/ZAWw/Bq630x8YLFLdHRYFiJ5FYnpnqvIU1t0iaYhH0eExOvk3W3f3Ea3uoMyNfmLIG84TMF/5D6c0dw+ExQN1TXRqzvJSb9HSbhVp8d+c1FjrMrZv9LI5mlmGsNsbyTwiVkZAUdBU9m7+vdnibH+HYFXMa4wdh9UDRVZneWV9vZWwBtXdGgzN23C44WHJ8T/H+TVgvvyy6d7ZFCsX0yuTWHst9zeHiTpEYEYn5UYWBZpYf0MrQcZ4h3s2qA36EnyoaE/3Z3HfSDqhpBVGTMOgmKtfAxm2S/brbOE4TVsNsyWl0q6fsq8UmORCF3dr9jzSPLOesAFSe+IiY7jHxVF7a2NBFsupeyF/XAX5TBKU2GWAHfw8AVIgKBUzrPVGLPbpyNwOy0OtIpVgMSGZ+zywgrXNSQ2jz/VQrkvq1hz0s7juUYCFVvl0bawjeb9CmWHVsuzLpvpKYA2iPiuENsxY+YmM1gtErkcKmHBPqDuqpY0rZGqs6HwOvIekaJoIeNnGPVUB0EehgXRQZBzh7y9MfNDu6UZ4giNbjGMyvMImXCBoJU7+Q+rf8JqDQrdjLCmA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5481fbe4-d683-4bd6-2007-08d9dc49fa62 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2022 19:20:54.4062 (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: DB7PR03MB4491 Subject: [FFmpeg-devel] [PATCH] avformat/http: 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: pxUftWI8sFE3 av_dict_set() with AV_DICT_DONT_STRDUP_VAL takes ownership of the string it is passed to as val; this includes freeing it on error. Fixes Coverity issue #1497468. Signed-off-by: Andreas Rheinhardt --- Untested. libavformat/http.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index cf04d3f14f..8b5fc3d2a4 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -335,10 +335,8 @@ static int redirect_cache_set(HTTPContext *s, const char *source, const char *de } ret = av_dict_set(&s->redirect_cache, source, value, AV_DICT_MATCH_CASE | AV_DICT_DONT_STRDUP_VAL); - if (ret < 0) { - av_free(value); + if (ret < 0) return ret; - } return 0; }