mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 05:26:11 +02:00
Code

negotiator/skipping: avoid stack overflow 

mark_common() in negotiator/skipping.c may overflow the stack due to
recursive function calls. Avoid this by instead recursing using a
heap-allocated data structure.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan 2022-10-25 16:29:34 -07:00 committed by Junio C Hamano
parent 7d8dc5a1af
commit 4654134976
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
negotiator/skipping.c
View File

@ -86,21 +86,26 @@ static int clear_marks(const char *refname, const struct object_id *oid,
/* /*
* Mark this SEEN commit and all its SEEN ancestors as COMMON. * Mark this SEEN commit and all its SEEN ancestors as COMMON.
*/ */
static void mark_common(struct data *data, struct commit *c) static void mark_common(struct data *data, struct commit *seen_commit)
{ {
struct commit_list *p; struct prio_queue queue = { NULL };
struct commit *c;
if (c->object.flags & COMMON) prio_queue_put(&queue, seen_commit);
return; while ((c = prio_queue_get(&queue))) {
c->object.flags |= COMMON; struct commit_list *p;
if (!(c->object.flags & POPPED)) if (c->object.flags & COMMON)
data->non_common_revs--; return;
c->object.flags |= COMMON;
if (!(c->object.flags & POPPED))
data->non_common_revs--;
if (!c->object.parsed) if (!c->object.parsed)
return; return;
for (p = c->parents; p; p = p->next) { for (p = c->parents; p; p = p->next) {
if (p->item->object.flags & SEEN) if (p->item->object.flags & SEEN)
mark_common(data, p->item); prio_queue_put(&queue, p->item);
}
} }
} }