Commit 17442b28 by Edward Thomson

leaks: fix some leaks in the tests

parent 97054833
...@@ -712,10 +712,13 @@ void test_config_write__repeated(void) ...@@ -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.setting2", "someValue2"));
cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting3", "someValue3")); cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting3", "someValue3"));
cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting4", "someValue4")); 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_config_open_ondisk(&cfg, filename));
cl_git_pass(git_futils_readbuffer(&result, filename)); cl_git_pass(git_futils_readbuffer(&result, filename));
cl_assert_equal_s(expected, result.ptr); cl_assert_equal_s(expected, result.ptr);
git_buf_free(&result); git_buf_free(&result);
git_config_free(cfg);
} }
...@@ -970,7 +970,9 @@ void test_iterator_index__pathlist_with_directory(void) ...@@ -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)); cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
expect_iterator_items(i, 4, NULL, 4, NULL); expect_iterator_items(i, 4, NULL, 4, NULL);
git_iterator_free(i); git_iterator_free(i);
git_index_free(index); git_index_free(index);
git_tree_free(tree);
git_vector_free(&filelist); git_vector_free(&filelist);
} }
......
...@@ -1020,6 +1020,7 @@ void test_iterator_tree__pathlist_with_directory(void) ...@@ -1020,6 +1020,7 @@ void test_iterator_tree__pathlist_with_directory(void)
expect_iterator_items(i, expected_len2, expected2, expected_len2, expected2); expect_iterator_items(i, expected_len2, expected2, expected_len2, expected2);
git_iterator_free(i); git_iterator_free(i);
git_tree_free(tree);
git_vector_free(&filelist); git_vector_free(&filelist);
} }
...@@ -1048,6 +1049,7 @@ void test_iterator_tree__pathlist_with_directory_include_tree_nodes(void) ...@@ -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); expect_iterator_items(i, expected_len, expected, expected_len, expected);
git_iterator_free(i); git_iterator_free(i);
git_tree_free(tree);
git_vector_free(&filelist); git_vector_free(&filelist);
} }
...@@ -1070,7 +1072,9 @@ void test_iterator_tree__pathlist_no_match(void) ...@@ -1070,7 +1072,9 @@ void test_iterator_tree__pathlist_no_match(void)
cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts));
cl_assert_equal_i(GIT_ITEROVER, git_iterator_current(&entry, i)); cl_assert_equal_i(GIT_ITEROVER, git_iterator_current(&entry, i));
git_iterator_free(i);
git_tree_free(tree);
git_vector_free(&filelist); git_vector_free(&filelist);
} }
...@@ -1030,6 +1030,8 @@ static void create_paths(const char *root, int depth) ...@@ -1030,6 +1030,8 @@ static void create_paths(const char *root, int depth)
create_paths(fullpath.ptr, (depth - 1)); create_paths(fullpath.ptr, (depth - 1));
} }
} }
git_buf_free(&fullpath);
} }
void test_iterator_workdir__pathlist_for_deeply_nested_item(void) void test_iterator_workdir__pathlist_for_deeply_nested_item(void)
......
...@@ -1211,15 +1211,15 @@ void test_status_worktree__with_directory_in_pathlist(void) ...@@ -1211,15 +1211,15 @@ void test_status_worktree__with_directory_in_pathlist(void)
const git_status_entry *status; const git_status_entry *status;
size_t i, entrycount; size_t i, entrycount;
bool native_ignore_case; bool native_ignore_case;
char *subdir_path = "subdir";
cl_git_pass(git_repository_index(&index, repo)); cl_git_pass(git_repository_index(&index, repo));
native_ignore_case = native_ignore_case =
(git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0; (git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0;
git_index_free(index); git_index_free(index);
opts.pathspec.strings = &subdir_path;
opts.pathspec.count = 1; opts.pathspec.count = 1;
opts.pathspec.strings = malloc(opts.pathspec.count * sizeof(char *));
opts.pathspec.strings[0] = "subdir";
opts.flags = opts.flags =
GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_DEFAULTS |
GIT_STATUS_OPT_INCLUDE_UNMODIFIED | GIT_STATUS_OPT_INCLUDE_UNMODIFIED |
...@@ -1240,6 +1240,8 @@ void test_status_worktree__with_directory_in_pathlist(void) ...@@ -1240,6 +1240,8 @@ void test_status_worktree__with_directory_in_pathlist(void)
status->index_to_workdir->old_file.path); status->index_to_workdir->old_file.path);
} }
git_status_list_free(statuslist);
opts.show = GIT_STATUS_SHOW_INDEX_ONLY; opts.show = GIT_STATUS_SHOW_INDEX_ONLY;
git_status_list_new(&statuslist, repo, &opts); git_status_list_new(&statuslist, repo, &opts);
...@@ -1255,6 +1257,8 @@ void test_status_worktree__with_directory_in_pathlist(void) ...@@ -1255,6 +1257,8 @@ void test_status_worktree__with_directory_in_pathlist(void)
status->head_to_index->old_file.path); status->head_to_index->old_file.path);
} }
git_status_list_free(statuslist);
opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR; opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
git_status_list_new(&statuslist, repo, &opts); git_status_list_new(&statuslist, repo, &opts);
...@@ -1269,5 +1273,7 @@ void test_status_worktree__with_directory_in_pathlist(void) ...@@ -1269,5 +1273,7 @@ void test_status_worktree__with_directory_in_pathlist(void)
testrepo2_subdir_paths[i], testrepo2_subdir_paths[i],
status->index_to_workdir->old_file.path); status->index_to_workdir->old_file.path);
} }
git_status_list_free(statuslist);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment