From patchwork Thu Jan 2 11:55:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17131 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6F73A44987A for ; Thu, 2 Jan 2020 13:55:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B0A068AD93; Thu, 2 Jan 2020 13:55:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D337D68AD48 for ; Thu, 2 Jan 2020 13:55:15 +0200 (EET) Received: by mail-pl1-f193.google.com with SMTP id g6so17748233plt.2 for ; Thu, 02 Jan 2020 03:55:15 -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=KvJLTkXSdv4UQSBh8mXM/C9x3I2kB3UW5GYEtdRUulF0b5pM97/hqo3t6b+N2nLB8G Q3jlUz+E7udHmixUbmtpzssUbTyOYbaT+0Q+tFCIdDzlO5GvR1h/L9+IAq/Vhfa0R1EU wvwP1jw9h61i6EmrgMIcGYwsZARMjh5xB6gJ2OkBhyxoToNK9+b7kNkLd0eDpTQP7M98 1MgcxmK3GD1KzyiWI1iskEKdmHSN/rrrN9LhrFWpInmjbiqxQGcgeTQkQd/aSTQSAZ83 wcX9OCZPSqhtanIeSGK9/yvicJ9CyXmSGi0YM1ZIO+Zs9K6nmlWbE2jjoui88MG6ls98 A8hw== 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=Wn1aY5Rcazelg9jl1+BQ/EuwudDG2u7EFr8CLxmcdwxd6Bq24HFzEV31jO2S6RJexH vwr8LqjS13x5Q++Ko9hCvbWfgb7oFNj4UG0GQK57wKdFSLzU9VU3FziGMtNh5srcUz/3 zsFzzwNfqqKuo/cQwY6UA3RkzJpS91AtaTYIhbBfZLaLmUiFkAMbAo+q5kADQ+VfG+mK Ae7TFJE4EC+CrevrVQzaBTH/5amNxaQ9+NdM1A3DyPrJlfRRoxrv1rwpCzcnB8DUS6pN lHNxrPAPiicfY8JjxTbCnnPb8Ps+WEdJ+PXPeQaAi5y1Z2WYyOwhQX2YI4zTtSgo0LK/ hfqg== X-Gm-Message-State: APjAAAW1wq03AMsPs5C2NF3e9BEPZJdpC1PJcbgtCtqlpI4JDojrK6LJ FKQKwCdQeijw+wQsKt65+p0rkTpR X-Google-Smtp-Source: APXvYqyo/QSzdpVw47TBy3BmPA8teV9ENdfhWffnYel+x3Kl/P2dl5cXwQTybHI8IsXXs/GZ/9c33Q== X-Received: by 2002:a17:90a:bd10:: with SMTP id y16mr19415464pjr.108.1577966114282; Thu, 02 Jan 2020 03:55:14 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id y76sm66267524pfc.87.2020.01.02.03.55.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jan 2020 03:55:13 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jan 2020 19:55:03 +0800 Message-Id: <1577966105-4642-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1577966105-4642-1-git-send-email-mypopydev@gmail.com> References: <1577966105-4642-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 3/5] 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" 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); }