From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Ramkumar Ramachandra <artagnon@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Nick Bowler <nbowler@elliptictech.com>
Subject: [PATCH 3/7] merge-recursive: free some string lists
Date: Mon, 21 May 2012 16:56:05 +0200 [thread overview]
Message-ID: <20120521145610.1911.82257.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20120521143309.1911.94302.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
merge-recursive.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 680937c..9c3570a 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1856,7 +1856,9 @@ int merge_trees(struct merge_options *o,
string_list_clear(re_merge, 0);
string_list_clear(re_head, 0);
string_list_clear(entries, 1);
-
+ free(re_merge);
+ free(re_head);
+ free(entries);
}
else
clean = 1;
--
1.7.10.2.555.g6528037
next prev parent reply other threads:[~2012-05-21 15:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 14:56 [PATCH 0/7] Fix some sequencer leaks Christian Couder
2012-05-21 14:56 ` [PATCH 1/7] sequencer: fix leaked todo_list memory Christian Couder
2012-05-21 20:57 ` Jonathan Nieder
2012-05-22 20:24 ` Christian Couder
2012-05-21 14:56 ` [PATCH 2/7] sequencer: release a strbuf used in save_head() Christian Couder
2012-05-22 4:12 ` Ramkumar Ramachandra
2012-05-22 4:23 ` Jonathan Nieder
2012-05-22 5:07 ` Ramkumar Ramachandra
2012-05-22 5:18 ` Jonathan Nieder
2012-05-22 14:17 ` Jonathan Nieder
2012-05-22 20:30 ` Christian Couder
2012-05-21 14:56 ` Christian Couder [this message]
2012-05-21 14:56 ` [PATCH 4/7] revert: free opts.revs to do a bit of cleanup Christian Couder
2012-05-22 5:14 ` Ramkumar Ramachandra
2012-05-22 20:03 ` Christian Couder
2012-05-21 14:56 ` [PATCH 5/7] revert: free revs->cmdline.rev Christian Couder
2012-05-21 20:39 ` Jonathan Nieder
2012-05-22 20:01 ` Christian Couder
2012-05-22 20:40 ` Jonathan Nieder
2012-05-21 14:56 ` [PATCH 6/7] unpack-trees: record which unpack error messages should be freed Christian Couder
2012-05-21 20:43 ` Jonathan Nieder
2012-05-22 20:22 ` Christian Couder
2012-05-21 14:56 ` [PATCH 7/7] Properly free unpack trees error messages Christian Couder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120521145610.1911.82257.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=nbowler@elliptictech.com \
/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.
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 NNTP newsgroup(s).