Merge pull request #3717 from libgit2/ethomson/leaks

Plug some leaks

6 files changed, 21 insertions, 2 deletions

diff --git a/tests/config/write.c b/tests/config/write.c
index e83cfb415..56ef2e9fb 100644
--- a/tests/config/write.c
+++ b/tests/config/write.c
@@ -712,10 +712,13 @@ void test_config_write__repeated(void)
 	cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting2", "someValue2"));
 	cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting3", "someValue3"));
 	cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting4", "someValue4"));
+	git_config_free(cfg);
 
 	cl_git_pass(git_config_open_ondisk(&cfg, filename));
 
 	cl_git_pass(git_futils_readbuffer(&result, filename));
 	cl_assert_equal_s(expected, result.ptr);
 	git_buf_free(&result);
+
+	git_config_free(cfg);
 }
diff --git a/tests/core/array.c b/tests/core/array.c
index 375cc8df3..8e626a506 100644
--- a/tests/core/array.c
+++ b/tests/core/array.c
@@ -51,5 +51,7 @@ void test_core_array__bsearch2(void)
 	expect_pos(50, 10, GIT_ENOTFOUND);
 	expect_pos(68, 10, GIT_ENOTFOUND);
 	expect_pos(256, 12, GIT_OK);
+
+	git_array_clear(integers);
 }
 
diff --git a/tests/iterator/index.c b/tests/iterator/index.c
index 64e7b14ba..b609d5990 100644
--- a/tests/iterator/index.c
+++ b/tests/iterator/index.c
@@ -970,7 +970,9 @@ void test_iterator_index__pathlist_with_directory(void)
 	cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
 	expect_iterator_items(i, 4, NULL, 4, NULL);
 	git_iterator_free(i);
+
 	git_index_free(index);
+	git_tree_free(tree);
 	git_vector_free(&filelist);
 }
 
diff --git a/tests/iterator/tree.c b/tests/iterator/tree.c
index b4d0f40f3..07da58371 100644
--- a/tests/iterator/tree.c
+++ b/tests/iterator/tree.c
@@ -1020,6 +1020,7 @@ void test_iterator_tree__pathlist_with_directory(void)
 	expect_iterator_items(i, expected_len2, expected2, expected_len2, expected2);
 	git_iterator_free(i);
 
+	git_tree_free(tree);
 	git_vector_free(&filelist);
 }
 
@@ -1048,6 +1049,7 @@ void test_iterator_tree__pathlist_with_directory_include_tree_nodes(void)
 	expect_iterator_items(i, expected_len, expected, expected_len, expected);
 	git_iterator_free(i);
 
+	git_tree_free(tree);
 	git_vector_free(&filelist);
 }
 
@@ -1070,7 +1072,9 @@ void test_iterator_tree__pathlist_no_match(void)
 
 	cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts));
 	cl_assert_equal_i(GIT_ITEROVER, git_iterator_current(&entry, i));
+	git_iterator_free(i);
 
+	git_tree_free(tree);
 	git_vector_free(&filelist);
 }
 
diff --git a/tests/iterator/workdir.c b/tests/iterator/workdir.c
index 3abaee65c..fc7771c20 100644
--- a/tests/iterator/workdir.c
+++ b/tests/iterator/workdir.c
@@ -1030,6 +1030,8 @@ static void create_paths(const char *root, int depth)
 				create_paths(fullpath.ptr, (depth - 1));
 		}
 	}
+
+	git_buf_free(&fullpath);
 }
 
 void test_iterator_workdir__pathlist_for_deeply_nested_item(void)
diff --git a/tests/status/worktree.c b/tests/status/worktree.c
index 97eff0b5c..d3b1dfb29 100644
--- a/tests/status/worktree.c
+++ b/tests/status/worktree.c
@@ -1211,15 +1211,15 @@ void test_status_worktree__with_directory_in_pathlist(void)
 	const git_status_entry *status;
 	size_t i, entrycount;
 	bool native_ignore_case;
+	char *subdir_path = "subdir";
 
 	cl_git_pass(git_repository_index(&index, repo));
 	native_ignore_case =
 			(git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0;
 	git_index_free(index);
 
+	opts.pathspec.strings = &subdir_path;
 	opts.pathspec.count = 1;
-	opts.pathspec.strings = malloc(opts.pathspec.count * sizeof(char *));
-	opts.pathspec.strings[0] = "subdir";
 	opts.flags =
 			GIT_STATUS_OPT_DEFAULTS |
 			GIT_STATUS_OPT_INCLUDE_UNMODIFIED |
@@ -1240,6 +1240,8 @@ void test_status_worktree__with_directory_in_pathlist(void)
 			status->index_to_workdir->old_file.path);
 	}
 
+	git_status_list_free(statuslist);
+
 	opts.show = GIT_STATUS_SHOW_INDEX_ONLY;
 	git_status_list_new(&statuslist, repo, &opts);
 
@@ -1255,6 +1257,8 @@ void test_status_worktree__with_directory_in_pathlist(void)
 			status->head_to_index->old_file.path);
 	}
 
+	git_status_list_free(statuslist);
+
 	opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
 	git_status_list_new(&statuslist, repo, &opts);
 
@@ -1269,5 +1273,7 @@ void test_status_worktree__with_directory_in_pathlist(void)
 			testrepo2_subdir_paths[i],
 			status->index_to_workdir->old_file.path);
 	}
+
+	git_status_list_free(statuslist);
 }