Merge pull request #3523 from pks-t/memleak-fixes

ethomson · ethomson · commit e0ab1ca0288d · 2015-11-24T14:30:41.000-05:00
Memleak fixes
diff --git a/tests/config/global.c b/tests/config/global.c
@@ -73,7 +73,7 @@ void test_config_global__open_programdata(void)
 	git_buf config_path = GIT_BUF_INIT;
 	git_buf var_contents = GIT_BUF_INIT;
 
-	if (!cl_getenv("GITTEST_INVASIVE_FS_STRUCTURE"))
+	if (cl_is_env_set("GITTEST_INVASIVE_FS_STRUCTURE"))
 		cl_skip();
 
 	cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH,
diff --git a/tests/config/stress.c b/tests/config/stress.c
@@ -126,4 +126,7 @@ void test_config_stress__quick_write(void)
 		cl_git_pass(git_config_get_int32(&val, config_r, key));
 		cl_assert_equal_i(i, val);
 	}
+
+	git_config_free(config_r);
+	git_config_free(config_w);
 }
diff --git a/tests/win32/longpath.c b/tests/win32/longpath.c
@@ -46,6 +46,8 @@ void assert_name_too_long(void)
 
 	/* check the suffix */
 	cl_assert_equal_s(expected_msg, err->message + (actual_len - expected_len));
+
+	git__free(expected_msg);
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -126,4 +126,7 @@ void test_config_stress__quick_write(void)`
`126`	`126`	`cl_git_pass(git_config_get_int32(&val, config_r, key));`
`127`	`127`	`cl_assert_equal_i(i, val);`
`128`	`128`	`}`
	`129`	`+`
	`130`	`+ git_config_free(config_r);`
	`131`	`+ git_config_free(config_w);`
`129`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ void assert_name_too_long(void)`
`46`	`46`
`47`	`47`	`/* check the suffix */`
`48`	`48`	`cl_assert_equal_s(expected_msg, err->message + (actual_len - expected_len));`
	`49`	`+`
	`50`	`+ git__free(expected_msg);`
`49`	`51`	`}`
`50`	`52`	`#endif`
`51`	`53`