mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-29 15:10:02 +00:00
Merge pull request #332 from kiryl/leaks
Fix two memory leaks pointed by valgrind
This commit is contained in:
commit
1c8a4aafad
@ -196,6 +196,8 @@ void git_index_free(git_index *index)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
git_index_clear(index);
|
git_index_clear(index);
|
||||||
|
git_vector_free(&index->entries);
|
||||||
|
git_vector_free(&index->unmerged);
|
||||||
|
|
||||||
free(index->index_file_path);
|
free(index->index_file_path);
|
||||||
free(index);
|
free(index);
|
||||||
|
11
src/refs.c
11
src/refs.c
@ -1404,7 +1404,14 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force)
|
|||||||
free(ref->name);
|
free(ref->name);
|
||||||
ref->name = new_ref->name;
|
ref->name = new_ref->name;
|
||||||
|
|
||||||
if ((error = git_hashtable_insert2(ref->owner->references.loose_cache, new_ref->name, new_ref, (void **)&old_ref)) < GIT_SUCCESS)
|
/*
|
||||||
|
* No need in new_ref anymore. We created it to fix the change on disk.
|
||||||
|
* TODO: Refactoring required.
|
||||||
|
*/
|
||||||
|
new_ref->name = NULL;
|
||||||
|
reference_free(new_ref);
|
||||||
|
|
||||||
|
if ((error = git_hashtable_insert2(ref->owner->references.loose_cache, ref->name, ref, (void **)&old_ref)) < GIT_SUCCESS)
|
||||||
goto rollback;
|
goto rollback;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1417,7 +1424,7 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force)
|
|||||||
head_target = git_reference_target(head);
|
head_target = git_reference_target(head);
|
||||||
|
|
||||||
if (head_target && !strcmp(head_target, old_name))
|
if (head_target && !strcmp(head_target, old_name))
|
||||||
if ((error = git_reference_create_symbolic(&head, new_ref->owner, "HEAD", new_ref->name, 1)) < GIT_SUCCESS)
|
if ((error = git_reference_create_symbolic(&head, ref->owner, "HEAD", ref->name, 1)) < GIT_SUCCESS)
|
||||||
goto rollback;
|
goto rollback;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
|
Loading…
Reference in New Issue
Block a user