diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-05-23 10:15:51 +0100 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2020-06-01 14:12:17 +0200 |
| commit | 0f35efeb5722f950218e3649d7814a6a91b1c351 (patch) | |
| tree | e53af9e934365660d0bacfd4c24b40434dfd353f /src/merge.c | |
| parent | abfdb8a6d252a4834df9234ad338c97f1a4f97f2 (diff) | |
| download | libgit2-ethomson/poolinit.tar.gz | |
git_pool_init: handle failure casesethomson/poolinit
Propagate failures caused by pool initialization errors.
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/merge.c b/src/merge.c index afe69e564..6e3a6c648 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1810,12 +1810,12 @@ git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo) diff_list->repo = repo; - git_pool_init(&diff_list->pool, 1); - 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_merge_diff_list__free(diff_list); + if (git_pool_init(&diff_list->pool, 1) < 0 || + 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_merge_diff_list__free(diff_list); return NULL; } |