path: root/bisect.c
diff options
authorMartin Ågren <>2017-11-05 20:24:30 (GMT)
committerJunio C Hamano <>2017-11-06 01:15:29 (GMT)
commit7c117184d7e3727d4240beb42148d106483d00b9 (patch)
treec76552523fce10e1df25b7a6762f0b34e6d2cc76 /bisect.c
parentfc5c40bb2bb1921f3bdfa55c1d846dc080c356b2 (diff)
bisect: fix off-by-one error in `best_bisection_sorted()`
After we have sorted the `cnt`-many commits that we have selected, we place them into the commit list. We then set `p->next` to NULL, but as we do so, `p` is already pointing one beyond item number `cnt`. Indeed, we check whether `p` is NULL before dereferencing it. This only matters if there are TREESAME-commits. Since they should be skipped, they are not included in `cnt` and we will hit the situation where we set `p->next` to NULL. As a result, the list will be one longer than it should be. The last commit in the list will be one which occurs earlier, or which shouldn't be included. Do not update `p` the very last round in the loop. This ensures that after the loop, `p->next` points to the remainder of the list, and we can set it to NULL. While we're here, free that remainder to fix a memory leak. Signed-off-by: Martin Ågren <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'bisect.c')
1 files changed, 4 insertions, 3 deletions
diff --git a/bisect.c b/bisect.c
index 2f43217..b194150 100644
--- a/bisect.c
+++ b/bisect.c
@@ -226,10 +226,11 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n
add_name_decoration(DECORATION_NONE, buf.buf, obj);
p->item = array[i].commit;
- p = p->next;
+ if (i < cnt - 1)
+ p = p->next;
- if (p)
- p->next = NULL;
+ free_commit_list(p->next);
+ p->next = NULL;
return list;