Skip to content

Commit 4f9327f

Browse files
committed
treebuilder: fix memory leaks in write_with_buffer
While we detect errors in `git_treebuilder_write_with_buffer`, we just exit directly instead of freeing allocated memory. Fix this by remembering error codes and skipping forward to the function's cleanup code.
1 parent a25df00 commit 4f9327f

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/tree.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -818,24 +818,24 @@ int git_treebuilder_write_with_buffer(git_oid *oid, git_treebuilder *bld, git_bu
818818
size_t i, entrycount;
819819
git_odb *odb;
820820
git_tree_entry *entry;
821-
git_vector entries;
821+
git_vector entries = GIT_VECTOR_INIT;
822822

823823
assert(bld);
824824
assert(tree);
825825

826826
git_buf_clear(tree);
827827

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

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

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

841841
git_vector_sort(&entries);
@@ -855,6 +855,7 @@ int git_treebuilder_write_with_buffer(git_oid *oid, git_treebuilder *bld, git_bu
855855
!(error = git_repository_odb__weakptr(&odb, bld->repo)))
856856
error = git_odb_write(oid, odb, tree->ptr, tree->size, GIT_OBJ_TREE);
857857

858+
out:
858859
git_vector_free(&entries);
859860

860861
return error;

0 commit comments

Comments
 (0)