mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-04 06:36:35 +02:00
Code

commit-reach(paint_down_to_common): plug two memory leaks 

When a commit is missing, we return early (currently pretending that no
merge basis could be found in that case). At that stage, it is possible
that a merge base could have been found already, and added to the
`result`, which is now leaked.

The priority queue has a similar issue: There might still be a commit in
that queue.

Let's release both, to address the potential memory leaks.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2024-02-28 09:44:07 +00:00 committed by Junio C Hamano
parent f41f85c9ec
commit e67431d496
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commit-reach.c
View File

@ -104,8 +104,11 @@ static struct commit_list *paint_down_to_common(struct repository *r,
parents = parents->next;
if ((p->object.flags & flags) == flags)
continue;
if (repo_parse_commit(r, p))
if (repo_parse_commit(r, p)) {
clear_prio_queue(&queue);
free_commit_list(result);
return NULL;
}
p->object.flags |= flags;
prio_queue_put(&queue, p);
}