Merge branch 'jt/fsck-code-cleanup'

gitster · gitster · commit 52b7ab31d08d · 2018-02-15T14:55:41.000-08:00
Plug recently introduced leaks in fsck.

* jt/fsck-code-cleanup:
  fsck: fix leak when traversing trees
diff --git a/builtin/fsck.c b/builtin/fsck.c
@@ -180,7 +180,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
`@@ -180,7 +180,13 @@ static void mark_object_reachable(struct object *obj)`
`180`	`180`
`181`	`181`	`static int traverse_one_object(struct object *obj)`
`182`	`182`	`{`
`183`		`- return fsck_walk(obj, obj, &fsck_walk_options);`
	`183`	`+ int result = fsck_walk(obj, obj, &fsck_walk_options);`
	`184`	`+`
	`185`	`+ if (obj->type == OBJ_TREE) {`
	`186`	`+ struct tree tree = (struct tree )obj;`
	`187`	`+ free_tree_buffer(tree);`
	`188`	`+ }`
	`189`	`+ return result;`
`184`	`190`	`}`
`185`	`191`
`186`	`192`	`static int traverse_reachable(void)`