leaks in tests

Author: ajdavis

tests/TestSuite.c

@@ -502,6 +502,8 @@ static void
 TestSuite_PrintJsonHeader (TestSuite *suite, /* IN */
                            FILE *stream)     /* IN */
 {
+   char *uri_str = test_framework_get_uri_str ();
+
 #ifdef _WIN32
 #  define INFO_BUFFER_SIZE 32767
 
@@ -539,7 +541,7 @@ TestSuite_PrintJsonHeader (TestSuite *suite, /* IN */
             "    \"fork\": \"%s\"\n"
             "  },\n"
             "  \"tests\": [\n",
-            test_framework_get_uri_str (),
+            uri_str,
             test_framework_is_mongos () ? "true" : "false",
             major_version, minor_version, build,
             si.dwProcessorType,
@@ -583,7 +585,7 @@ TestSuite_PrintJsonHeader (TestSuite *suite, /* IN */
             "    \"fork\": \"%s\"\n"
             "  },\n"
             "  \"tests\": [\n",
-            test_framework_get_uri_str (),
+            uri_str,
             test_framework_is_mongos () ? "true" : "false",
             u.sysname,
             u.release,
@@ -595,6 +597,8 @@ TestSuite_PrintJsonHeader (TestSuite *suite, /* IN */
 #endif
 
    fflush (stream);
+
+   bson_free (uri_str);
 }
 
 

tests/test-libmongoc.c

@@ -657,8 +657,15 @@ test_framework_get_uri_str_no_auth (const char *database_name)
 char *
 test_framework_get_uri_str ()
 {
-   return test_framework_add_user_password_from_env (
-      test_framework_get_uri_str_no_auth (NULL));
+   char *uri_str_no_auth;
+   char *uri_str;
+
+   uri_str_no_auth = test_framework_get_uri_str_no_auth (NULL);
+   uri_str = test_framework_add_user_password_from_env (uri_str_no_auth);
+
+   bson_free (uri_str_no_auth);
+
+   return uri_str;
 }
 
 

tests/test-mongoc-topology.c

@@ -180,6 +180,7 @@ _test_server_selection (bool try_once)
                                     primary_pref, 15, &error);
    assert (request = mock_server_receives_ismaster (server));
    mock_server_replies_simple (request, secondary_response);
+   request_destroy (request);
 
    if (try_once) {
       /* selection fails without another ismaster call */