commit-reach: fix memory and flag leaks

derrickstolee · gitster · commit 4067a64672f9 · 2018-09-21T11:36:29.000-07:00
The can_all_from_reach_with_flag() method uses 'assign_flag' as a
value we can use to mark objects temporarily during our commit walk.
The intent is that these flags are removed from all objects before
returning. However, this is not the case.

The 'from' array could also contain objects that are not commits, and
we mark those objects with 'assign_flag'. Add a loop to the 'cleanup'
section that removes these markers.

Also, we forgot to free() the memory for 'list', so add that to the
'cleanup' section.

Signed-off-by: Derrick Stolee &lt;dstolee@microsoft.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/commit-reach.c b/commit-reach.c
@@ -626,6 +626,11 @@ int can_all_from_reach_with_flag(struct object_array *from,
 		clear_commit_marks(list[i], RESULT);
 		clear_commit_marks(list[i], assign_flag);
 	}
+	free(list);
+
+	for (i = 0; i < from->nr; i++)
+		from->objects[i].item->flags &= ~assign_flag;
+
 	return result;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,11 @@ int can_all_from_reach_with_flag(struct object_array *from,`
`626`	`626`	`clear_commit_marks(list[i], RESULT);`
`627`	`627`	`clear_commit_marks(list[i], assign_flag);`
`628`	`628`	`}`
	`629`	`+ free(list);`
	`630`	`+`
	`631`	`+ for (i = 0; i < from->nr; i++)`
	`632`	`+ from->objects[i].item->flags &= ~assign_flag;`
	`633`	`+`
`629`	`634`	`return result;`
`630`	`635`	`}`
`631`	`636`