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

Fix a few leaks

Browse Source 
The interesting one is the notification macro, which was returning
directly on a soft-abort instead of going through the cleanup.
This commit is contained in:
Carlos Martín Nieto 2015-05-13 16:12:45 +02:00
parent d01737b419
commit 3e529e9d2d
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/stash.c
View File

@ -701,10 +701,14 @@ int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int ver
return 0; return 0;
} }
#define NOTIFY_PROGRESS(opts, progress_type) \ #define NOTIFY_PROGRESS(opts, progress_type) \
if ((opts).progress_cb && \ do { \
(error = (opts).progress_cb((progress_type), (opts).progress_payload))) \ if ((opts).progress_cb && \
return (error < 0) ? error : -1; (error = (opts).progress_cb((progress_type), (opts).progress_payload))) { \
error = (error < 0) ? error : -1; \
goto cleanup; \
} \
} while(false);
int git_stash_apply( int git_stash_apply(
git_repository *repo, git_repository *repo,

2
tests/stash/apply.c
View File

@ -44,6 +44,8 @@ void test_stash_apply__initialize(void)
assert_status(repo, "how", GIT_STATUS_CURRENT); assert_status(repo, "how", GIT_STATUS_CURRENT);
assert_status(repo, "who", GIT_STATUS_CURRENT); assert_status(repo, "who", GIT_STATUS_CURRENT);
assert_status(repo, "when", GIT_ENOTFOUND); assert_status(repo, "when", GIT_ENOTFOUND);
git_index_free(repo_index);
} }
void test_stash_apply__cleanup(void) void test_stash_apply__cleanup(void)

1
tests/submodule/modify.c
View File

@ -257,4 +257,5 @@ void test_submodule_modify__save_last(void)
cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_gitmodules_only")); cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_gitmodules_only"));
cl_git_pass(git_submodule_save(sm)); cl_git_pass(git_submodule_save(sm));
git_submodule_free(sm);
} }