threads / patch / 6457

patch--walk-reflogs: do not crash with cyclic reflog ancestry

Subject: [PATCH] --walk-reflogs: do not crash with cyclic reflog ancestry

## tl;dr

One message between Jan 20, 2007 and Jan 20, 2007. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Johannes Schindelin· Jan 20, 2007, 21:28 UTC · lore

Since you can reset --hard to any revision you already had, when traversing the reflog ancestry, we may not free() the commit buffer.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
 builtin-log.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Show changes to builtin-log.c +5 −2
diff --git a/builtin-log.c b/builtin-log.c
index f3cff13..13a3f9b 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -50,8 +50,11 @@ static int cmd_log_walk(struct rev_info *rev)
 	prepare_revision_walk(rev);
 	while ((commit = get_revision(rev)) != NULL) {
 		log_tree_commit(rev, commit);
-		free(commit->buffer);
-		commit->buffer = NULL;
+		if (!rev->reflog_info) {
+			/* we allow cycles in reflog ancestry */
+			free(commit->buffer);
+			commit->buffer = NULL;
+		}
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
-- 
1.5.0.rc1.g956c1-dirty

← back to recent threads