зеркало из https://github.com/microsoft/git.git
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 <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
fc5c40bb2b
Коммит
7c117184d7
7
bisect.c
7
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);
|
add_name_decoration(DECORATION_NONE, buf.buf, obj);
|
||||||
|
|
||||||
p->item = array[i].commit;
|
p->item = array[i].commit;
|
||||||
p = p->next;
|
if (i < cnt - 1)
|
||||||
|
p = p->next;
|
||||||
}
|
}
|
||||||
if (p)
|
free_commit_list(p->next);
|
||||||
p->next = NULL;
|
p->next = NULL;
|
||||||
strbuf_release(&buf);
|
strbuf_release(&buf);
|
||||||
free(array);
|
free(array);
|
||||||
return list;
|
return list;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче