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/pack-objects.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/pack-objects.c')
| -rw-r--r-- | src/pack-objects.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/pack-objects.c b/src/pack-objects.c index 49b4e4772..2e5b64005 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -141,14 +141,11 @@ int git_packbuilder_new(git_packbuilder **out, git_repository *repo) pb = git__calloc(1, sizeof(*pb)); GIT_ERROR_CHECK_ALLOC(pb); - if (git_oidmap_new(&pb->object_ix) < 0) + if (git_oidmap_new(&pb->object_ix) < 0 || + git_oidmap_new(&pb->walk_objects) < 0 || + git_pool_init(&pb->object_pool, sizeof(struct walk_object)) < 0) goto on_error; - if (git_oidmap_new(&pb->walk_objects) < 0) - goto on_error; - - git_pool_init(&pb->object_pool, sizeof(struct walk_object)); - pb->repo = repo; pb->nr_threads = 1; /* do not spawn any thread by default */ |