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

Merge pull request #3904 from stinb/filesystem-iterator-double-free

Browse Source 
filesystem_iterator: fixed double free on error
This commit is contained in:
Patrick Steinhardt 2016-08-24 08:28:49 +02:00 committed by GitHub
commit c60210d367
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/iterator.c
View File

@ -1834,6 +1834,9 @@ static int iterator_for_filesystem(
iter = git__calloc(1, sizeof(filesystem_iterator));
GITERR_CHECK_ALLOC(iter);
iter->base.type = type;
iter->base.cb = &callbacks;
root_len = strlen(root);
iter->root = git__malloc(root_len+2);
@ -1851,9 +1854,6 @@ static int iterator_for_filesystem(
if ((error = git_buf_puts(&iter->current_path, iter->root)) < 0)
goto on_error;
iter->base.type = type;
iter->base.cb = &callbacks;
if ((error = iterator_init_common(&iter->base, repo, index, options)) < 0)
goto on_error;
@ -1877,8 +1877,6 @@ static int iterator_for_filesystem(
return 0;
on_error:
git__free(iter->root);
git_buf_free(&iter->current_path);
git_iterator_free(&iter->base);
return error;
}