* [PATCH 1/2] sequencer: fix leaked todo_list memory
@ 2012-05-04 19:40 Christian Couder
0 siblings, 0 replies; only message in thread
From: Christian Couder @ 2012-05-04 19:40 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Ramkumar Ramachandra, Jonathan Nieder, Nick Bowler
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
Hi,
This is a very small series to fix a few memory leaks.
It will not fix the main leaks but it's a start.
Regards,
Christian.
sequencer.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index f83cdfd..aa4c1a4 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -892,6 +892,7 @@ static int continue_single_pick(void)
static int sequencer_continue(struct replay_opts *opts)
{
struct commit_list *todo_list = NULL;
+ int res;
if (!file_exists(git_path(SEQ_TODO_FILE)))
return continue_single_pick();
@@ -907,8 +908,11 @@ static int sequencer_continue(struct replay_opts *opts)
}
if (index_differs_from("HEAD", 0))
return error_dirty_index(opts);
- todo_list = todo_list->next;
- return pick_commits(todo_list, opts);
+ res = pick_commits(todo_list->next, opts);
+
+ free_commit_list(todo_list);
+
+ return res;
}
static int single_pick(struct commit *cmit, struct replay_opts *opts)
@@ -921,6 +925,7 @@ int sequencer_pick_revisions(struct replay_opts *opts)
{
struct commit_list *todo_list = NULL;
unsigned char sha1[20];
+ int res;
if (opts->subcommand == REPLAY_NONE)
assert(opts->revs);
@@ -977,5 +982,9 @@ int sequencer_pick_revisions(struct replay_opts *opts)
}
save_head(sha1_to_hex(sha1));
save_opts(opts);
- return pick_commits(todo_list, opts);
+ res = pick_commits(todo_list, opts);
+
+ free_commit_list(todo_list);
+
+ return res;
}
--
1.7.10.579.g68891.dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-04 19:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-04 19:40 [PATCH 1/2] sequencer: fix leaked todo_list memory Christian Couder
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).