diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2014-12-24 11:42:50 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2014-12-29 18:18:49 +0200 |
| commit | 6f73e02605f57db20b8713053d55fef4b534f07b (patch) | |
| tree | 9dc9140be76f4f627cf20a648c5d509ffe27542c /src/merge.c | |
| parent | 5692dcf181d26069d68d460fc9179c8c96fa3795 (diff) | |
| download | libgit2-6f73e02605f57db20b8713053d55fef4b534f07b.tar.gz | |
Plug some leaks
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 1c55e797b..7031efcc7 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1550,8 +1550,10 @@ git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo) if (git_vector_init(&diff_list->staged, 0, NULL) < 0 || git_vector_init(&diff_list->conflicts, 0, NULL) < 0 || git_vector_init(&diff_list->resolved, 0, NULL) < 0 || - git_pool_init(&diff_list->pool, 1, 0) < 0) + git_pool_init(&diff_list->pool, 1, 0) < 0) { + git_merge_diff_list__free(diff_list); return NULL; + } return diff_list; } |