diff options
-rw-r--r-- | src/apply.c | 3 | ||||
-rw-r--r-- | src/attr_file.c | 11 | ||||
-rw-r--r-- | src/attrcache.c | 5 | ||||
-rw-r--r-- | src/checkout.c | 8 | ||||
-rw-r--r-- | src/diff_generate.c | 5 | ||||
-rw-r--r-- | src/diff_parse.c | 5 | ||||
-rw-r--r-- | src/diff_tform.c | 5 | ||||
-rw-r--r-- | src/index.c | 3 | ||||
-rw-r--r-- | src/iterator.c | 8 | ||||
-rw-r--r-- | src/merge.c | 10 | ||||
-rw-r--r-- | src/pack-objects.c | 9 | ||||
-rw-r--r-- | src/pathspec.c | 7 | ||||
-rw-r--r-- | src/refdb_fs.c | 3 | ||||
-rw-r--r-- | src/revwalk.c | 8 | ||||
-rw-r--r-- | src/sortedcache.c | 5 | ||||
-rw-r--r-- | src/transaction.c | 3 |
16 files changed, 49 insertions, 49 deletions
diff --git a/src/apply.c b/src/apply.c index fc60e1418..f90166343 100644 --- a/src/apply.c +++ b/src/apply.c @@ -63,7 +63,8 @@ static int patch_image_init_fromstr( memset(out, 0x0, sizeof(patch_image)); - git_pool_init(&out->pool, sizeof(git_diff_line)); + if (git_pool_init(&out->pool, sizeof(git_diff_line)) < 0) + return -1; for (start = in; start < in + in_len; start = end) { end = memchr(start, '\n', in_len - (start - in)); diff --git a/src/attr_file.c b/src/attr_file.c index 82da5268f..3f69b5ffc 100644 --- a/src/attr_file.c +++ b/src/attr_file.c @@ -41,16 +41,21 @@ int git_attr_file__new( if (git_mutex_init(&attrs->lock) < 0) { git_error_set(GIT_ERROR_OS, "failed to initialize lock"); - git__free(attrs); - return -1; + goto on_error; } - git_pool_init(&attrs->pool, 1); + if (git_pool_init(&attrs->pool, 1) < 0) + goto on_error; + GIT_REFCOUNT_INC(attrs); attrs->entry = entry; attrs->source = source; *out = attrs; return 0; + +on_error: + git__free(attrs); + return -1; } int git_attr_file__clear_rules(git_attr_file *file, bool need_lock) diff --git a/src/attrcache.c b/src/attrcache.c index f02dd9d1d..47fb675e0 100644 --- a/src/attrcache.c +++ b/src/attrcache.c @@ -391,11 +391,10 @@ int git_attr_cache__init(git_repository *repo) * hashtable for attribute macros, and string pool */ if ((ret = git_strmap_new(&cache->files)) < 0 || - (ret = git_strmap_new(&cache->macros)) < 0) + (ret = git_strmap_new(&cache->macros)) < 0 || + (ret = git_pool_init(&cache->pool, 1)) < 0) goto cancel; - git_pool_init(&cache->pool, 1); - cache = git__compare_and_swap(&repo->attrcache, NULL, cache); if (cache) goto cancel; /* raced with another thread, free this but no error */ diff --git a/src/checkout.c b/src/checkout.c index 272bd3789..1e6ea4ddf 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1310,7 +1310,8 @@ static int checkout_get_actions( size_t i, *counts = NULL; uint32_t *actions = NULL; - git_pool_init(&pathpool, 1); + if (git_pool_init(&pathpool, 1) < 0) + return -1; if (data->opts.paths.count > 0 && git_pathspec__vinit(&pathspec, &data->opts.paths, &pathpool) < 0) @@ -2526,9 +2527,8 @@ static int checkout_data_init( git_config_entry_free(conflict_style); } - git_pool_init(&data->pool, 1); - - if ((error = git_vector_init(&data->removes, 0, git__strcmp_cb)) < 0 || + if ((error = git_pool_init(&data->pool, 1)) < 0 || + (error = git_vector_init(&data->removes, 0, git__strcmp_cb)) < 0 || (error = git_vector_init(&data->remove_conflicts, 0, NULL)) < 0 || (error = git_vector_init(&data->update_conflicts, 0, NULL)) < 0 || (error = git_buf_puts(&data->target_path, data->opts.target_directory)) < 0 || diff --git a/src/diff_generate.c b/src/diff_generate.c index b69ef3032..e9e524229 100644 --- a/src/diff_generate.c +++ b/src/diff_generate.c @@ -423,9 +423,8 @@ static git_diff_generated *diff_generated_alloc( git_attr_session__init(&diff->base.attrsession, repo); memcpy(&diff->base.opts, &dflt, sizeof(git_diff_options)); - git_pool_init(&diff->base.pool, 1); - - if (git_vector_init(&diff->base.deltas, 0, git_diff_delta__cmp) < 0) { + if (git_pool_init(&diff->base.pool, 1) < 0 || + git_vector_init(&diff->base.deltas, 0, git_diff_delta__cmp) < 0) { git_diff_free(&diff->base); return NULL; } diff --git a/src/diff_parse.c b/src/diff_parse.c index 098e56f9a..75e41a544 100644 --- a/src/diff_parse.c +++ b/src/diff_parse.c @@ -52,9 +52,8 @@ static git_diff_parsed *diff_parsed_alloc(void) diff->base.opts.flags &= ~GIT_DIFF_IGNORE_CASE; - git_pool_init(&diff->base.pool, 1); - - if (git_vector_init(&diff->patches, 0, NULL) < 0 || + if (git_pool_init(&diff->base.pool, 1) < 0 || + git_vector_init(&diff->patches, 0, NULL) < 0 || git_vector_init(&diff->base.deltas, 0, git_diff_delta__cmp) < 0) { git_diff_free(&diff->base); return NULL; diff --git a/src/diff_tform.c b/src/diff_tform.c index 437144ae2..7de88bd0d 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -136,11 +136,10 @@ int git_diff__merge( return -1; } - if (git_vector_init(&onto_new, onto->deltas.length, git_diff_delta__cmp) < 0) + if (git_vector_init(&onto_new, onto->deltas.length, git_diff_delta__cmp) < 0 || + git_pool_init(&onto_pool, 1) < 0) return -1; - git_pool_init(&onto_pool, 1); - for (i = 0, j = 0; i < onto->deltas.length || j < from->deltas.length; ) { git_diff_delta *o = GIT_VECTOR_GET(&onto->deltas, i); const git_diff_delta *f = GIT_VECTOR_GET(&from->deltas, j); diff --git a/src/index.c b/src/index.c index 907bd6d93..3cae40534 100644 --- a/src/index.c +++ b/src/index.c @@ -411,7 +411,8 @@ int git_index_open(git_index **index_out, const char *index_path) index = git__calloc(1, sizeof(git_index)); GIT_ERROR_CHECK_ALLOC(index); - git_pool_init(&index->tree_pool, 1); + if (git_pool_init(&index->tree_pool, 1) < 0) + goto fail; if (index_path != NULL) { index->index_file_path = git__strdup(index_path); diff --git a/src/iterator.c b/src/iterator.c index e26e2c0c7..a393187c0 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -897,9 +897,8 @@ static int tree_iterator_init(tree_iterator *iter) { int error; - git_pool_init(&iter->entry_pool, sizeof(tree_iterator_entry)); - - if ((error = tree_iterator_frame_init(iter, iter->root, NULL)) < 0) + if ((error = git_pool_init(&iter->entry_pool, sizeof(tree_iterator_entry))) < 0 || + (error = tree_iterator_frame_init(iter, iter->root, NULL)) < 0) return error; iter->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS; @@ -1376,7 +1375,8 @@ static int filesystem_iterator_frame_push( filesystem_iterator_entry_cmp)) < 0) goto done; - git_pool_init(&new_frame->entry_pool, 1); + if ((error = git_pool_init(&new_frame->entry_pool, 1)) < 0) + goto done; /* check if this directory is ignored */ filesystem_iterator_frame_push_ignores(iter, frame_entry, new_frame); 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; } 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 */ diff --git a/src/pathspec.c b/src/pathspec.c index 19ea9eb19..83f776c91 100644 --- a/src/pathspec.c +++ b/src/pathspec.c @@ -238,9 +238,9 @@ int git_pathspec__init(git_pathspec *ps, const git_strarray *paths) memset(ps, 0, sizeof(*ps)); ps->prefix = git_pathspec_prefix(paths); - git_pool_init(&ps->pool, 1); - if ((error = git_pathspec__vinit(&ps->pathspec, paths, &ps->pool)) < 0) + if ((error = git_pool_init(&ps->pool, 1)) < 0 || + (error = git_pathspec__vinit(&ps->pathspec, paths, &ps->pool)) < 0) git_pathspec__clear(ps); return error; @@ -316,7 +316,8 @@ static git_pathspec_match_list *pathspec_match_alloc( if (!m) return NULL; - git_pool_init(&m->pool, 1); + if (git_pool_init(&m->pool, 1) < 0) + return NULL; /* need to keep reference to pathspec and increment refcount because * failures array stores pointers to the pattern strings of the diff --git a/src/refdb_fs.c b/src/refdb_fs.c index 653cc1b97..28ea474c9 100644 --- a/src/refdb_fs.c +++ b/src/refdb_fs.c @@ -683,7 +683,8 @@ static int refdb_fs_backend__iterator( iter = git__calloc(1, sizeof(refdb_fs_iter)); GIT_ERROR_CHECK_ALLOC(iter); - git_pool_init(&iter->pool, 1); + if ((error = git_pool_init(&iter->pool, 1)) < 0) + goto out; if ((error = git_vector_init(&iter->loose, 8, NULL)) < 0) goto out; diff --git a/src/revwalk.c b/src/revwalk.c index abbd65ac2..1efb938bd 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -659,13 +659,11 @@ int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo) git_revwalk *walk = git__calloc(1, sizeof(git_revwalk)); GIT_ERROR_CHECK_ALLOC(walk); - if (git_oidmap_new(&walk->commits) < 0) + if (git_oidmap_new(&walk->commits) < 0 || + git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 || + git_pool_init(&walk->commit_pool, COMMIT_ALLOC) < 0) return -1; - if (git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0) - return -1; - - git_pool_init(&walk->commit_pool, COMMIT_ALLOC); walk->get_next = &revwalk_next_unsorted; walk->enqueue = &revwalk_enqueue_unsorted; diff --git a/src/sortedcache.c b/src/sortedcache.c index 8f7ea23e2..ee6363f6d 100644 --- a/src/sortedcache.c +++ b/src/sortedcache.c @@ -25,9 +25,8 @@ int git_sortedcache_new( sc = git__calloc(1, alloclen); GIT_ERROR_CHECK_ALLOC(sc); - git_pool_init(&sc->pool, 1); - - if (git_vector_init(&sc->items, 4, item_cmp) < 0 || + if (git_pool_init(&sc->pool, 1) < 0 || + git_vector_init(&sc->items, 4, item_cmp) < 0 || git_strmap_new(&sc->map) < 0) goto fail; diff --git a/src/transaction.c b/src/transaction.c index 7367d1240..81af8d831 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -76,7 +76,8 @@ int git_transaction_new(git_transaction **out, git_repository *repo) assert(out && repo); - git_pool_init(&pool, 1); + if ((error = git_pool_init(&pool, 1)) < 0) + goto on_error; tx = git_pool_mallocz(&pool, sizeof(git_transaction)); if (!tx) { |