From 9edd7e4652e080a1a3b1ef614d22eba75b39ef87 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 21 Sep 2006 02:07:19 +0200 Subject: [PATCH] receive-pack: plug memory leak in fast-forward checking code. Signed-off-by: Junio C Hamano --- receive-pack.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/receive-pack.c b/receive-pack.c index a6ec9f900..ea2dbd4e3 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -131,17 +131,18 @@ static int update(struct command *cmd) } if (deny_non_fast_forwards && !is_null_sha1(old_sha1)) { struct commit *old_commit, *new_commit; - struct commit_list *bases; + struct commit_list *bases, *ent; old_commit = (struct commit *)parse_object(old_sha1); new_commit = (struct commit *)parse_object(new_sha1); - for (bases = get_merge_bases(old_commit, new_commit, 1); - bases; bases = bases->next) - if (!hashcmp(old_sha1, bases->item->object.sha1)) + bases = get_merge_bases(old_commit, new_commit, 1); + for (ent = bases; ent; ent = ent->next) + if (!hashcmp(old_sha1, ent->item->object.sha1)) break; - if (!bases) + free_commit_list(bases); + if (!ent) return error("denying non-fast forward;" - " you should pull first"); + " you should pull first"); } safe_create_leading_directories(lock_name); -- 2.26.2