mirror of
https://git.proxmox.com/git/libgit2
synced 2025-07-04 11:11:22 +00:00
Plug a small memory leak
This commit is contained in:
parent
e82b6d13d2
commit
ab4bcc038a
@ -753,8 +753,11 @@ static int checkout_conflicts_load(checkout_data *data, git_iterator *workdir, g
|
|||||||
conflict->theirs = theirs;
|
conflict->theirs = theirs;
|
||||||
|
|
||||||
if ((error = checkout_conflict_detect_submodule(conflict)) < 0 ||
|
if ((error = checkout_conflict_detect_submodule(conflict)) < 0 ||
|
||||||
(error = checkout_conflict_detect_binary(data->repo, conflict)) < 0)
|
(error = checkout_conflict_detect_binary(data->repo, conflict)) < 0)
|
||||||
|
{
|
||||||
|
git__free(conflict);
|
||||||
goto done;
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
git_vector_insert(&data->conflicts, conflict);
|
git_vector_insert(&data->conflicts, conflict);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user