From patchwork Wed Jan 1 05:20:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17160 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp440628qvb; Tue, 31 Dec 2019 21:21:26 -0800 (PST) X-Google-Smtp-Source: APXvYqzWplVUllYjKn5zuafnJ9EuvhOn0V76cST2bkaLb8Od/MSf6EtjO0b6gGBsYNn30ewFJlDn X-Received: by 2002:a17:906:12cf:: with SMTP id l15mr80568644ejb.264.1577856086381; Tue, 31 Dec 2019 21:21:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577856086; cv=none; d=google.com; s=arc-20160816; b=Rvv8fby/Utz81Ji3tLCW8pEanjPe6kT0s/9jRbOvNgkyO+xYpQGFLjtCJrdp3t1asF PDa5CIPPP1riISzj4zUJ7glYlt8oBiEuWnr8n5/BATho6O+a+pnEhLlgaoSlVVwI9KH9 fIiGX0ohDRki0oAbIu3hR4Zq+EMosMADMV5i2sjekXZeoytlVt3DCJbbQI4lGmdToBcO OalsWnd2VILv/4Bcpmdsaev3nP7e8i27di4NNdMXn5Uk/6uRAp08SRj0dECN8Urfnm0L m4a8Mx0DaXo9od9RQ+pKEO40EXp0fmBKQoQnUzx03kaq2VfDTHYmIUkPOjrelK4ygAmW LRIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=XI8VnmI0f9cmaDvNI6ulJ8wK3oXxftvRlrRkrja1YY4=; b=DwFMH0RIdQ2QeU2jn6gvi287SuNhjvSdkK27D/nehG+yl1Y56mC3Ypb0kcmSlEbHkl T5awdT701HIQmTT7JKH0nLKXgWAKHROTFEcph8ix2+nQtZPutip/yMprKoU4aI0K86fT FjKUvyGB1YseV6g+KN3ia7eUupkxipfloCBxHP5QOfa2W42Z1zYWb9TXmBhOW1/snnLG t6+N5gP/Fw3s43ihGtYzICop6/hmqf/wrfKjs3NioMXtyhHu+/M6VS1I732oTBj42kZP YO7TIT3EFOu/ldALWPdvmzffmcyTnzvD6vlFdO2dUQGCcNVRMwI0h6zZI8Bb1w1DinWm IG0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="QfP/F3GB"; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i6si32471571ejs.437.2019.12.31.21.21.26; Tue, 31 Dec 2019 21:21:26 -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=@gmail.com header.s=20161025 header.b="QfP/F3GB"; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D00368AD08; Wed, 1 Jan 2020 07:21:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C4B5687FB5 for ; Wed, 1 Jan 2020 07:20:55 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id w62so20449090pfw.8 for ; Tue, 31 Dec 2019 21:20:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yHd7035PGfWKm1LosLdvKAOs5bS3OSKb5vqFuWbFiEM=; b=QfP/F3GB9BtV3+Nl7ZE9Fce81XHAX9TCZ+Ao8bvARSz0okOkbLWBe5U4+xgRjNyENW L+tutH6imeWsgnzRUnaOjSVeKHO7d4zRjR0w7KkehH1MmOkQbmZF2JhCWJc8uGh5yPB0 LZYCgYMhezPLXnvE9trwAvsVv+KQrfOdEaoR2Je83ZgQD0dGvoExdpUJAgzjauy4xmuX O2YYCuE2UIPS4q1xqyLnD2NtUJ+yrvaTs3Y7/fJLfoYVBa1b6HIWPLtt8pXiD0V0rGm9 lnm7TE0URaLvW4SLmNljeVlJp107Idl7WrCETPU0wJYXzyT5BTeh1hNZRAy1fsF9irBV 1q2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yHd7035PGfWKm1LosLdvKAOs5bS3OSKb5vqFuWbFiEM=; b=m3r5C2bUj+/Ga9FIWJf2FxMn3h+NV+TjbstK9Cq1nVCN0Kq504jeWBISQTrUfgA4s/ R+UtqlVqzx1lUNAxe7pinsua5DhEQkGnKwv0sxuYZQSKmdBHEjT8J2p/ci57eqlcGXLP HyZJdOxsNpQE6cfSnE1jviK3fhBdq3vpDv26ODAl+EBodvAD0zl6nwSFQXTqbWI5nQpi 6HRNC4W87X2EjXvpMWmn2i8zercVltYlBF78QNnsXGLRmIgdNrQibwAp9d7CwFCPpJ3y LQYdLKFR57ejIZmkPaHm8i5Hq/wG37Fg2yBNxW54GildSEeJazQA2S9TrZjfQv9mOYz2 50Ig== X-Gm-Message-State: APjAAAU7JXFQ5ZkWxSgm8cQZiw2G9BY/gB/fyQDznqBQziN555vOmDU9 UkGGTPlhH6NxkwYWP+MwEvWp7cSh X-Received: by 2002:a63:6c03:: with SMTP id h3mr77685668pgc.19.1577856054010; Tue, 31 Dec 2019 21:20:54 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s15sm53908530pgq.4.2019.12.31.21.20.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 21:20:53 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 13:20:32 +0800 Message-Id: <1577856040-17409-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1577856040-17409-1-git-send-email-mypopydev@gmail.com> References: <1577856040-17409-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 04/12] lavc/libvpxenc: fix memory leak after av_dict_parse_string fail X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2NC9YH9S84Yp Content-Length: 1399 From: Jun Zhao In case of failure, all the successfully set entries are stored in *pm. We need to manually free the created dictionary to avoid memory leak. Signed-off-by: Jun Zhao --- libavcodec/libvpxenc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 721a052..e9b3793 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -768,9 +768,8 @@ FF_ENABLE_DEPRECATION_WARNINGS "Error parsing option '%s = %s'.\n", en->key, en->value); } - - av_dict_free(&dict); } + av_dict_free(&dict); } dump_enc_cfg(avctx, &enccfg);