Merge pull request #3685 from pks-t/pks/memleaks

Test memleaks

tests/index/nsec.c

@@ -56,7 +56,7 @@ static bool should_expect_nsecs(void)
 
 	p_unlink(nsec_path.ptr);
 
-	git_buf_clear(&nsec_path);
+	git_buf_free(&nsec_path);
 
 	return expect;
 }
@@ -89,7 +89,7 @@ void test_index_nsec__staging_maintains_other_nanos(void)
 	const git_index_entry *entry;
 	bool expect_nsec, test_file_has_nsec;
 
-    expect_nsec = should_expect_nsecs();
+	expect_nsec = should_expect_nsecs();
 	test_file_has_nsec = try_create_file_with_nsec_timestamp("nsecs/a.txt");
 
 	cl_assert_equal_b(expect_nsec, test_file_has_nsec);

tests/transport/register.c

@@ -40,20 +40,23 @@ void test_transport_register__custom_transport_error_remove_non_existing(void)
 
 void test_transport_register__custom_transport_ssh(void)
 {
+	const char *urls[] = {
+		"ssh://somehost:somepath",
+		"ssh+git://somehost:somepath",
+		"git+ssh://somehost:somepath",
+		"git@somehost:somepath",
+	};
 	git_transport *transport;
+	unsigned i;
 
+	for (i = 0; i < ARRAY_SIZE(urls); i++) {
 #ifndef GIT_SSH
-	cl_git_fail_with(git_transport_new(&transport, NULL, "ssh://somehost:somepath"), -1);
-	cl_git_fail_with(git_transport_new(&transport, NULL, "ssh+git://somehost:somepath"), -1);
-	cl_git_fail_with(git_transport_new(&transport, NULL, "git+ssh://somehost:somepath"), -1);
-	cl_git_fail_with(git_transport_new(&transport, NULL, "git@somehost:somepath"), -1);
+		cl_git_fail_with(git_transport_new(&transport, NULL, urls[i]), -1);
 #else
-	cl_git_pass(git_transport_new(&transport, NULL, "ssh://somehost:somepath"));
-	cl_git_pass(git_transport_new(&transport, NULL, "ssh+git://somehost:somepath"));
-	cl_git_pass(git_transport_new(&transport, NULL, "git+ssh://somehost:somepath"));
-	cl_git_pass(git_transport_new(&transport, NULL, "git@somehost:somepath"));
-	transport->free(transport);
+		cl_git_pass(git_transport_new(&transport, NULL, urls[i]));
+		transport->free(transport);
 #endif
+	}
 
 	cl_git_pass(git_transport_register("ssh", dummy_transport, NULL));
 
@@ -63,16 +66,12 @@ void test_transport_register__custom_transport_ssh(void)
 
 	cl_git_pass(git_transport_unregister("ssh"));
 
+	for (i = 0; i < ARRAY_SIZE(urls); i++) {
 #ifndef GIT_SSH
-	cl_git_fail_with(git_transport_new(&transport, NULL, "ssh://somehost:somepath"), -1);
-	cl_git_fail_with(git_transport_new(&transport, NULL, "ssh+git://somehost:somepath"), -1);
-	cl_git_fail_with(git_transport_new(&transport, NULL, "git+ssh://somehost:somepath"), -1);
-	cl_git_fail_with(git_transport_new(&transport, NULL, "git@somehost:somepath"), -1);
+		cl_git_fail_with(git_transport_new(&transport, NULL, urls[i]), -1);
 #else
-	cl_git_pass(git_transport_new(&transport, NULL, "ssh://somehost:somepath"));
-	cl_git_pass(git_transport_new(&transport, NULL, "ssh+git://somehost:somepath"));
-	cl_git_pass(git_transport_new(&transport, NULL, "git+ssh://somehost:somepath"));
-	cl_git_pass(git_transport_new(&transport, NULL, "git@somehost:somepath"));
-	transport->free(transport);
+		cl_git_pass(git_transport_new(&transport, NULL, urls[i]));
+		transport->free(transport);
 #endif
+	}
 }