Skip to content

Commit b0d2440

Browse files
committed
Merge branch 'ew/commit-reach-clean-up-flags-fix'
Fix a segfaulting loop. The function and its caller may need further clean-up. * ew/commit-reach-clean-up-flags-fix: commit-reach: avoid NULL dereference
2 parents 6f54213 + c5773dc commit b0d2440

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

commit-reach.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,12 @@ int can_all_from_reach_with_flag(struct object_array *from,
809809
clear_commit_marks_many(nr_commits, list, RESULT | assign_flag);
810810
free(list);
811811

812-
for (i = 0; i < from->nr; i++)
813-
from->objects[i].item->flags &= ~assign_flag;
812+
for (i = 0; i < from->nr; i++) {
813+
struct object *from_one = from->objects[i].item;
814+
815+
if (from_one)
816+
from_one->flags &= ~assign_flag;
817+
}
814818

815819
return result;
816820
}

0 commit comments

Comments
 (0)