summaryrefslogtreecommitdiff
path: root/src/diff_tform.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-12-12 12:11:38 -0800
committerRussell Belfer <rb@github.com>2013-12-12 12:11:38 -0800
commit9cfce2735d77f4d8b6005e62349dd97c0c6de5ab (patch)
treeb538c09a7d7d6285f218a052019332ac02bb314c /src/diff_tform.c
parent11bd7a034ba9046a7ba601c446e937377d507065 (diff)
downloadlibgit2-9cfce2735d77f4d8b6005e62349dd97c0c6de5ab.tar.gz
Cleanups, renames, and leak fixes
This renames git_vector_free_all to the better git_vector_free_deep and also contains a couple of memory leak fixes based on valgrind checks. The fixes are specifically: failure to free global dir path variables when not compiled with threading on and failure to free filters from the filter registry that had not be initialized fully.
Diffstat (limited to 'src/diff_tform.c')
-rw-r--r--src/diff_tform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c
index da4bdb3f5..263a64d12 100644
--- a/src/diff_tform.c
+++ b/src/diff_tform.c
@@ -209,7 +209,7 @@ int git_diff_merge(git_diff *onto, const git_diff *from)
git_pool_strdup_safe(&onto->pool, onto->opts.new_prefix);
}
- git_vector_free_all(&onto_new);
+ git_vector_free_deep(&onto_new);
git_pool_clear(&onto_pool);
return error;
@@ -440,7 +440,7 @@ static int apply_splits_and_deletes(
return 0;
on_error:
- git_vector_free_all(&onto);
+ git_vector_free_deep(&onto);
return -1;
}