Skip to content

git_treebuilder_write_with_buffer refactorings #4182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethomson merged 3 commits into from
Mar 28, 2017
Merged

git_treebuilder_write_with_buffer refactorings #4182

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f9327f
treebuilder: fix memory leaks in `write_with_buffer`
pks-t Mar 27, 2017
8d1e71f
treebuilder: remove shadowing variable in `write_with_buffer`
pks-t Mar 27, 2017
06abbb7
treebuilder: exit early if running OOM in `write_with_buffer`
pks-t Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,43 +818,45 @@ int git_treebuilder_write_with_buffer(git_oid *oid, git_treebuilder *bld, git_bu
size_t i, entrycount;
git_odb *odb;
git_tree_entry *entry;
git_vector entries;
git_vector entries = GIT_VECTOR_INIT;

assert(bld);
assert(tree);

git_buf_clear(tree);

entrycount = git_strmap_num_entries(bld->map);
if (git_vector_init(&entries, entrycount, entry_sort_cmp) < 0)
return -1;
if ((error = git_vector_init(&entries, entrycount, entry_sort_cmp)) < 0)
goto out;

if (tree->asize == 0 &&
(error = git_buf_grow(tree, entrycount * 72)) < 0)
return error;
(error = git_buf_grow(tree, entrycount * 72)) < 0)
goto out;

git_strmap_foreach_value(bld->map, entry, {
if (git_vector_insert(&entries, entry) < 0)
return -1;
if ((error = git_vector_insert(&entries, entry)) < 0)
goto out;
});

git_vector_sort(&entries);

for (i = 0; i < entries.length && !error; ++i) {
git_tree_entry *entry = git_vector_get(&entries, i);
entry = git_vector_get(&entries, i);

git_buf_printf(tree, "%o ", entry->attr);
git_buf_put(tree, entry->filename, entry->filename_len + 1);
git_buf_put(tree, (char *)entry->oid->id, GIT_OID_RAWSZ);

if (git_buf_oom(tree))
if (git_buf_oom(tree)) {
error = -1;
goto out;
}
}

if (!error &&
!(error = git_repository_odb__weakptr(&odb, bld->repo)))
if ((error = git_repository_odb__weakptr(&odb, bld->repo)) == 0)
error = git_odb_write(oid, odb, tree->ptr, tree->size, GIT_OBJ_TREE);

out:
git_vector_free(&entries);

return error;
Expand Down