From patchwork Wed Jan 1 05:20:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17149 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp440935qvb; Tue, 31 Dec 2019 21:21:51 -0800 (PST) X-Google-Smtp-Source: APXvYqydWI15qubVdGY4/LYoOc8dmGaYGHuWa1AbAuFKVuR4o1g83dkEkfjRyBBtJdhEIeUfl1LV X-Received: by 2002:a05:6402:b0a:: with SMTP id bm10mr51610586edb.251.1577856111047; Tue, 31 Dec 2019 21:21:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577856111; cv=none; d=google.com; s=arc-20160816; b=gwaSAVkr8qKbfbcRDsY2ZWk79Oy16QS9p1wOwdmZVItpapYFMY1oMcu5UZHh3hkSY1 tHesIW/MWbEg62v/HSt4KxTnDyUvAoXC2+DC3U7MbzBfZvvTzRViiLz5J5EQmzDeK5N0 LFc5G5dhawn353OlZn/GMRjDPAPFWTPNe/1kuUaUEnOGhudrbYDd3qTLm7LfDQzpMPdO Fz+eK/rGgKi40kavSN8AgqfJwKv01kS+ijDLY7WSbeW/dhlJ0SD6XfeYg3Xylm7XlkHM D2ilfsvRoyfvvMp7dEnxVNBSn01xP3LLLmEvBM6hRb60fT6NwqfPCX16jOHkFw6tPpIY 0EhQ== 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=Ev4WLfumbM8cr63fOykpZFvqH3hrSnFe5Kaq+M1MLmE=; b=yfvjDcyQNl8uEzY9vdZMpoHQREDIcZbguGk66qrIo/MF7qceiM5sfYLN3z6ieFPES6 u3NAWs6QpVgtlhugJWWMZRDSGv9zxwwmcIz5FFE2TjptUpMmEQu6aGgJ/iZ+et5JgNaj Py2rhB+V/QKL/9C0cnUojREm3z1uVRrB75p2yKwTQCrbF6OIMyQ0zYWbTi9wle4Er8BB wYOYb4zLeMFspIL2kJJpnm/LXuk2u8kwVXauu3I5oAhU0hDQ8PhrXnBz7L3icVEnd+wT z4AlQWLCEB7UbLnKnSg3AE1OECRofoDRAte0JSZ5HTdIFHdw8FMJaoF24EPeebKw/iks Zy5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Jt4ch9pK; 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 c11si31854331eds.65.2019.12.31.21.21.50; Tue, 31 Dec 2019 21:21:51 -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=Jt4ch9pK; 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 CFEC068AD73; Wed, 1 Jan 2020 07:21:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CD0F68AD6A for ; Wed, 1 Jan 2020 07:21:04 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id x8so20263180pgk.8 for ; Tue, 31 Dec 2019 21:21:04 -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=6yrvcVgj5eYj0o5o9xkEW6Hocjay229traSW8D8SlhM=; b=Jt4ch9pK35vpptiOXwBM00WcMkA1ZM2SRI7M15gTmvpok4QI5P32Dbr6apF0GY6EPR TPy36aMMA39IdnsEoaBBIMh4xsRRHPgcpTJYtgex+Gt93Q53Y61r7pwzejNSTIW/1je6 cONn+fVqvJ/6YQsk+j/fUn4F/3iqtUU7wzT9lJ83IpzuNqyVEkTANKzueM2kz6Y6Byuo 6CteNwjFZNghJGYVH8nTcu5ouGH9TzTV0Mvze2ZtQfdNDzIbyTouNOlHjZuyaKst1GzX C8QRJcidtsVH/tPstVTvIoXTehmqTkK5tsrPmlU66fdhWLYt1/Jryjp9raJGqeBhw1WO szRQ== 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=6yrvcVgj5eYj0o5o9xkEW6Hocjay229traSW8D8SlhM=; b=WImF+eLnP2flv5ZCxKGxDfhvZDsg47Gm/yE2D/4jWtWhAafWxs1ZxuHvNta0XhKSw9 T3IP7QJFioCv5LJkASOQ3nefPSZhfFpHqEmfmBkIc8y6MZAQjbCpz+8E3A90b0S6Y6rg atHHoemWVKX14sP6ikZq5k20B1tgH9TDvoeuMGNgMGfhDShSA0pAA+4KWBUOKeXQT9jU /rJO+NSeENAycmt95TuywETV7rgVkg8FizLLZM2ibI8uvDlwyZDMMhs37z8D0SW19L8Y KIvgp6v0IzqeoF7aFDG3jfvalR6eJsj1YnP1iVLsAeDpEUjRltBtU2pYwchSuC43zD31 rkOg== X-Gm-Message-State: APjAAAWpSbXIr6vQi0f6NhFoErDsvKalDJeODnBQzjkGXKButV/eEIfz wDwUv7dcr+IZNV3GQorQ2t5fncH1 X-Received: by 2002:a63:5924:: with SMTP id n36mr82714504pgb.43.1577856062918; Tue, 31 Dec 2019 21:21:02 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s15sm53908530pgq.4.2019.12.31.21.21.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 21:21:02 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 13:20:36 +0800 Message-Id: <1577856040-17409-8-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 08/12] lavfi/coreimage: 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: 7LP79LTFKZq9 Content-Length: 2319 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 --- libavfilter/vf_coreimage.m | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index 323a28c..4ed5ba7 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -486,6 +486,7 @@ static av_cold int init(AVFilterContext *fctx) av_log(ctx, AV_LOG_DEBUG, "Filter_string: %s\n", ctx->filter_string); ret = av_dict_parse_string(&filter_dict, ctx->filter_string, "@", "#", AV_DICT_MULTIKEY); // parse filter_name:all_filter_options if (ret) { + av_dict_free(&filter_dict); av_log(ctx, AV_LOG_ERROR, "Parsing of filters failed.\n"); return AVERROR(EIO); } @@ -507,6 +508,7 @@ static av_cold int init(AVFilterContext *fctx) if (strncmp(f->value, "default", 7)) { // not default ret = av_dict_parse_string(&filter_options, f->value, "=", "@", 0); // parse option_name:option_value if (ret) { + av_dict_free(&filter_options); av_log(ctx, AV_LOG_ERROR, "Parsing of filter options for \"%s\" failed.\n", f->key); return AVERROR(EIO); }