mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit-reach: properly peel tags

Browse Source 
The can_all_from_reach_with_flag() algorithm was refactored in 4fbcca4e
"commit-reach: make can_all_from_reach... linear" but incorrectly
assumed that all objects provided were commits. During a fetch
negotiation, ok_to_give_up() in upload-pack.c may provide unpeeled tags
to the 'from' array. The current code creates a segfault.

Add a direct call to can_all_from_reach_with_flag() in 'test-tool reach'
and add a test in t6600-test-reach.sh that demonstrates this segfault.

Correct the issue by peeling tags when investigating the initial list
of objects in the 'from' array.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee
2018-09-21 08:05:26 -07:00
committed by Junio C Hamano
parent 6621c83874
commit b67f6b26e3
3 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
commit-reach.c
View File

@ -544,20 +544,42 @@ int can_all_from_reach_with_flag(struct object_array *from,
{
struct commit **list = NULL;
int i;
int nr_commits;
int result = 1;
ALLOC_ARRAY(list, from->nr);
nr_commits = 0;
for (i = 0; i < from->nr; i++) {
list[i] = (struct commit *)from->objects[i].item;
struct object *from_one = from->objects[i].item;
if (parse_commit(list[i]) ||
list[i]->generation < min_generation)
return 0;
if (!from_one || from_one->flags & assign_flag)
continue;
from_one = deref_tag(the_repository, from_one,
"a from object", 0);
if (!from_one || from_one->type != OBJ_COMMIT) {
/* no way to tell if this is reachable by
* looking at the ancestry chain alone, so
* leave a note to ourselves not to worry about
* this object anymore.
*/
from->objects[i].item->flags |= assign_flag;
continue;
}
list[nr_commits] = (struct commit *)from_one;
if (parse_commit(list[nr_commits]) ||
list[nr_commits]->generation < min_generation) {
result = 0;
goto cleanup;
}
nr_commits++;
}
QSORT(list, from->nr, compare_commits_by_gen);
QSORT(list, nr_commits, compare_commits_by_gen);
for (i = 0; i < from->nr; i++) {
for (i = 0; i < nr_commits; i++) {
/* DFS from list[i] */
struct commit_list *stack = NULL;
@ -600,7 +622,7 @@ int can_all_from_reach_with_flag(struct object_array *from,
}
cleanup:
for (i = 0; i < from->nr; i++) {
for (i = 0; i < nr_commits; i++) {
clear_commit_marks(list[i], RESULT);
clear_commit_marks(list[i], assign_flag);
}