Some memory leak fixes

3 files changed, 10 insertions, 4 deletions

diff --git a/tests/threads/diff.c b/tests/threads/diff.c
index d33e75f2c..79b85800b 100644
--- a/tests/threads/diff.c
+++ b/tests/threads/diff.c
@@ -103,6 +103,7 @@ static void *run_index_diffs(void *arg)
 	}
 
 	git_diff_free(diff);
+	giterr_clear();
 
 	return arg;
 }
@@ -139,8 +140,7 @@ static void *run_index_diffs_with_modifier(void *arg)
 			git_thread_yield();
 		}
 
-		git_index_free(idx);
-		return arg;
+		goto done;
 	}
 
 	/* only use explicit index in this test to prevent reloading */
@@ -164,7 +164,10 @@ static void *run_index_diffs_with_modifier(void *arg)
 	/* results will be unpredictable with index modifier thread running */
 
 	git_diff_free(diff);
+
+done:
 	git_index_free(idx);
+	giterr_clear();
 
 	return arg;
 }
diff --git a/tests/threads/iterator.c b/tests/threads/iterator.c
index 4dd251fa5..8aeae1a6c 100644
--- a/tests/threads/iterator.c
+++ b/tests/threads/iterator.c
@@ -11,7 +11,7 @@ void test_threads_iterator__cleanup(void)
 
 static void *run_workdir_iterator(void *arg)
 {
-	int error = 0, thread = *(int *)arg;
+	int error = 0;
 	git_iterator *iter;
 	const git_index_entry *entry = NULL;
 
@@ -35,7 +35,7 @@ static void *run_workdir_iterator(void *arg)
 	cl_assert_equal_i(GIT_ITEROVER, error);
 
 	git_iterator_free(iter);
-
+	giterr_clear();
 	return arg;
 }
 
diff --git a/tests/threads/refdb.c b/tests/threads/refdb.c
index fbf6ac09b..3b35b45e3 100644
--- a/tests/threads/refdb.c
+++ b/tests/threads/refdb.c
@@ -37,6 +37,7 @@ static void *iterate_refs(void *arg)
 
 	git_reference_iterator_free(i);
 
+	giterr_clear();
 	return arg;
 }
 
@@ -115,6 +116,7 @@ static void *create_refs(void *arg)
 	for (i = 0; i < 10; ++i)
 		git_reference_free(ref[i]);
 
+	giterr_clear();
 	return arg;
 }
 
@@ -141,6 +143,7 @@ static void *delete_refs(void *arg)
 		}
 	}
 
+	giterr_clear();
 	return arg;
 }