From: Eric Wong <e@80x24.org>
Date: Sat, 20 Jan 2018 07:43:51 +0000 (+0000)
Subject: fsck: fix leak when traversing trees
X-Git-Tag: v2.17.0-rc0~99^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba3a08ca0ec0d800d2fdbe73984927c1d8199082;p=thirdparty%2Fgit.git

fsck: fix leak when traversing trees

While fsck_walk/fsck_walk_tree/parse_tree populates "struct tree"
idempotently, it is still up to the fsck_walk caller to call
free_tree_buffer.

Fixes: ad2db4030e42890e ("fsck: remove redundant parse_tree() invocation")

Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 64542ac3de..5aa4a1b336 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -170,7 +170,13 @@ static void mark_object_reachable(struct object *obj)
 
 static int traverse_one_object(struct object *obj)
 {
-	return fsck_walk(obj, obj, &fsck_walk_options);
+	int result = fsck_walk(obj, obj, &fsck_walk_options);
+
+	if (obj->type == OBJ_TREE) {
+		struct tree *tree = (struct tree *)obj;
+		free_tree_buffer(tree);
+	}
+	return result;
 }
 
 static int traverse_reachable(void)