Skip to content

Fix a _very_ improbable memory leak in git_odb_new() #4988

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
pks-t merged 1 commit into from
Feb 20, 2019
Merged

Fix a _very_ improbable memory leak in git_odb_new() #4988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/odb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,12 @@ int git_odb_new(git_odb **out)
git_odb *db = git__calloc(1, sizeof(*db));
GIT_ERROR_CHECK_ALLOC(db);

if (git_cache_init(&db->own_cache) < 0 ||
git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) {
if (git_cache_init(&db->own_cache) < 0) {
git__free(db);
return -1;
}
if (git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) {
git_cache_free(&db->own_cache);
Copy link
Copy Markdown
Member

@pks-t pks-t Feb 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more instance of a misnamed _free function. git_cache_free does not free the cache struct itself, but only disposes its contents. So this change is correct.

I'll create a PR that renames this function to git_cache_dispose, as it should be called

git__free(db);
return -1;
}
Expand Down