fsck: fix leak when traversing trees

Eric Wong · gitster · commit ba3a08ca0ec0 · 2018-01-23T10:18:37.000-08:00
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: ad2db40 ("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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,13 @@ static void mark_object_reachable(struct object *obj)`
`170`	`170`
`171`	`171`	`static int traverse_one_object(struct object *obj)`
`172`	`172`	`{`
`173`		`- return fsck_walk(obj, obj, &fsck_walk_options);`
	`173`	`+ int result = fsck_walk(obj, obj, &fsck_walk_options);`
	`174`	`+`
	`175`	`+ if (obj->type == OBJ_TREE) {`
	`176`	`+ struct tree tree = (struct tree )obj;`
	`177`	`+ free_tree_buffer(tree);`
	`178`	`+ }`
	`179`	`+ return result;`
`174`	`180`	`}`
`175`	`181`
`176`	`182`	`static int traverse_reachable(void)`