proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-11 20:13:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a bunch of leaks, error handling cases

Browse Source
This commit is contained in:
Scott J. Goldman 2012-12-09 21:55:51 -08:00
parent e51c8b99be
commit 7d26c410bf
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/graph.c
View File

@ -32,7 +32,6 @@ static int interesting(git_pqueue *list, git_commit_list *roots)
static int mark_parents(git_revwalk *walk, git_commit_list_node *one, static int mark_parents(git_revwalk *walk, git_commit_list_node *one,
git_commit_list_node *two) git_commit_list_node *two)
{ {
int error;
unsigned int i; unsigned int i;
git_commit_list *roots = NULL; git_commit_list *roots = NULL;
git_pqueue list; git_pqueue list;
@ -47,16 +46,16 @@ static int mark_parents(git_revwalk *walk, git_commit_list_node *one,
return -1; return -1;
if (git_commit_list_parse(walk, one) < 0) if (git_commit_list_parse(walk, one) < 0)
return -1; goto on_error;
one->flags |= PARENT1; one->flags |= PARENT1;
if (git_pqueue_insert(&list, one) < 0) if (git_pqueue_insert(&list, one) < 0)
return -1; goto on_error;
if (git_commit_list_parse(walk, two) < 0) if (git_commit_list_parse(walk, two) < 0)
return -1; goto on_error;
two->flags |= PARENT2; two->flags |= PARENT2;
if (git_pqueue_insert(&list, two) < 0) if (git_pqueue_insert(&list, two) < 0)
return -1; goto on_error;
/* as long as there are non-STALE commits */ /* as long as there are non-STALE commits */
while (interesting(&list, roots)) { while (interesting(&list, roots)) {
@ -80,25 +79,29 @@ static int mark_parents(git_revwalk *walk, git_commit_list_node *one,
if ((p->flags & flags) == flags) if ((p->flags & flags) == flags)
continue; continue;
if ((error = git_commit_list_parse(walk, p)) < 0) if (git_commit_list_parse(walk, p) < 0)
return error; goto on_error;
p->flags |= flags; p->flags |= flags;
if (git_pqueue_insert(&list, p) < 0) if (git_pqueue_insert(&list, p) < 0)
return -1; goto on_error;
} }
/* Keep track of root commits, to make sure the path gets marked */
if (commit->out_degree == 0) { if (commit->out_degree == 0) {
if (git_commit_list_insert(commit, &roots) == NULL) if (git_commit_list_insert(commit, &roots) == NULL)
return -1; goto on_error;
} }
} }
if (roots) git_commit_list_free(&roots);
git_commit_list_free(&roots);
git_pqueue_free(&list); git_pqueue_free(&list);
return 0; return 0;
on_error:
git_commit_list_free(&roots);
git_pqueue_free(&list);
return -1;
} }