Merge branch 'jt/fsck-code-cleanup' into maint

gitster · gitster · commit d78b7eb2d50b · 2018-03-22T14:24:12.000-07: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
@@ -171,7 +171,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
`@@ -171,7 +171,13 @@ static void mark_object_reachable(struct object *obj)`
`171`	`171`
`172`	`172`	`static int traverse_one_object(struct object *obj)`
`173`	`173`	`{`
`174`		`- return fsck_walk(obj, obj, &fsck_walk_options);`
	`174`	`+ int result = fsck_walk(obj, obj, &fsck_walk_options);`
	`175`	`+`
	`176`	`+ if (obj->type == OBJ_TREE) {`
	`177`	`+ struct tree tree = (struct tree )obj;`
	`178`	`+ free_tree_buffer(tree);`
	`179`	`+ }`
	`180`	`+ return result;`
`175`	`181`	`}`
`176`	`182`
`177`	`183`	`static int traverse_reachable(void)`