diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:10 -0700 |
| commit | b0d2440442e3455887bd0afaa2c630ef9c4e583d (patch) | |
| tree | 7e7a3ce3ba895b12d6f36e7e765fcc1e6de9a7eb /commit-reach.c | |
| parent | 6f54213718ccd05be8a07f74d0d4e524ebccb3be (diff) | |
| parent | c5773dc078f05a98c9359938dbce3b3dc70aa3bd (diff) | |
| download | git-b0d2440442e3455887bd0afaa2c630ef9c4e583d.tar.gz | |
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
Diffstat (limited to 'commit-reach.c')
| -rw-r--r-- | commit-reach.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/commit-reach.c b/commit-reach.c index 5ba822a720..7c0c39fd28 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -809,8 +809,12 @@ cleanup: clear_commit_marks_many(nr_commits, list, RESULT | assign_flag); free(list); - for (i = 0; i < from->nr; i++) - from->objects[i].item->flags &= ~assign_flag; + for (i = 0; i < from->nr; i++) { + struct object *from_one = from->objects[i].item; + + if (from_one) + from_one->flags &= ~assign_flag; + } return result; } |