From: Ben Peart <peartben@gmail.com>
To: Kevin Willford <kewillf@microsoft.com>, git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net
Subject: Re: [PATCH 1/3] merge-recursive: fix memory leak
Date: Mon, 28 Aug 2017 18:42:58 -0400 [thread overview]
Message-ID: <770a93c1-9115-3104-ebae-3cdc69d658de@gmail.com> (raw)
In-Reply-To: <20170828202829.3056-2-kewillf@microsoft.com>
On 8/28/2017 4:28 PM, Kevin Willford wrote:
> In merge_trees if process_renames or process_entry returns less
> than zero, the method will just return and not free re_merge,
> re_head, or entries.
>
> This change cleans up the allocated variables before returning
> to the caller.
>
> Signed-off-by: Kevin Willford <kewillf@microsoft.com>
Nice catch on the leaks. Looks good to me.
> ---
> merge-recursive.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 1494ffdb82..033d7cd406 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -1956,7 +1956,7 @@ int merge_trees(struct merge_options *o,
> re_merge = get_renames(o, merge, common, head, merge, entries);
> clean = process_renames(o, re_head, re_merge);
> if (clean < 0)
> - return clean;
> + goto cleanup;
> for (i = entries->nr-1; 0 <= i; i--) {
> const char *path = entries->items[i].string;
> struct stage_data *e = entries->items[i].util;
> @@ -1964,8 +1964,10 @@ int merge_trees(struct merge_options *o,
> int ret = process_entry(o, path, e);
> if (!ret)
> clean = 0;
> - else if (ret < 0)
> - return ret;
> + else if (ret < 0) {
> + clean = ret;
> + goto cleanup;
> + }
> }
> }
> for (i = 0; i < entries->nr; i++) {
> @@ -1975,6 +1977,7 @@ int merge_trees(struct merge_options *o,
> entries->items[i].string);
> }
>
> +cleanup:
> string_list_clear(re_merge, 0);
> string_list_clear(re_head, 0);
> string_list_clear(entries, 1);
> @@ -1982,6 +1985,9 @@ int merge_trees(struct merge_options *o,
> free(re_merge);
> free(re_head);
> free(entries);
> +
> + if (clean < 0)
> + return clean;
> }
> else
> clean = 1;
>
next prev parent reply other threads:[~2017-08-28 22:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-28 20:28 [PATCH 0/3] merge-recursive: replace string_list with hashmap Kevin Willford
2017-08-28 20:28 ` [PATCH 1/3] merge-recursive: fix memory leak Kevin Willford
2017-08-28 22:42 ` Ben Peart [this message]
2017-08-29 8:12 ` Jeff King
2017-08-28 20:28 ` [PATCH 2/3] merge-recursive: remove return value from get_files_dirs Kevin Willford
2017-08-28 22:45 ` Ben Peart
2017-08-29 8:19 ` Jeff King
2017-08-29 8:17 ` Jeff King
2017-08-29 15:58 ` Kevin Willford
2017-08-29 16:50 ` Jeff King
2017-08-31 18:12 ` Stefan Beller
2017-08-28 20:28 ` [PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap Kevin Willford
2017-08-28 23:06 ` Ben Peart
2017-08-29 8:41 ` Jeff King
2017-09-06 3:35 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=770a93c1-9115-3104-ebae-3cdc69d658de@gmail.com \
--to=peartben@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kewillf@microsoft.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).