CDRIVER-446 Fix a leak in mongoc_client_command_simple()

fix a leak in mongoc_client_command_simple().

Fix some other random leaks while we're at it

Closes #110

Author: hanumantmk

src/mongoc/mongoc-collection.c

@@ -1000,7 +1000,8 @@ mongoc_collection_get_index_info (mongoc_collection_t *collection,
    bool cmd_success;
    mongoc_read_prefs_t *read_prefs;
    bson_t cmd = BSON_INITIALIZER;
-   bson_t *reply = bson_new ();
+   bson_t command_reply;
+   bson_t *reply = NULL;
 
    BSON_ASSERT (collection);
 
@@ -1010,32 +1011,30 @@ mongoc_collection_get_index_info (mongoc_collection_t *collection,
    read_prefs = mongoc_read_prefs_new (MONGOC_READ_PRIMARY);
 
    cmd_success = mongoc_collection_command_simple (collection, &cmd, NULL,
-                                                   reply, error);
+                                                   &command_reply, error);
 
    if (cmd_success) {
        /* intentionally empty */
+       reply = bson_copy (&command_reply);
    } else if (error->code == MONGOC_ERROR_COLLECTION_DOES_NOT_EXIST) {
        bson_t empty_arr = BSON_INITIALIZER;
        /* collection does not exist. in accordance with the spec we return
        * an empty array. Also we need to clear out the error. */
        error->code = 0;
        error->domain = 0;
-       BSON_APPEND_ARRAY (reply, "indexes", &empty_arr);
+       BSON_APPEND_ARRAY (&command_reply, "indexes", &empty_arr);
+       reply = bson_copy (&command_reply);
    } else if (error->code == MONGOC_ERROR_QUERY_COMMAND_NOT_FOUND) {
-      bson_destroy (reply);
       /* talking to an old server. */
       /* clear out error. */
       error->code = 0;
       error->domain = 0;
       reply =
          _mongoc_collection_get_index_info_legacy (collection, error);
-   } else {
-      /* network error */
-      bson_destroy (reply);
-      reply = NULL;
    }
 
    bson_destroy (&cmd);
+   bson_destroy (&command_reply);
    mongoc_read_prefs_destroy (read_prefs);
 
    return reply;

src/mongoc/mongoc-database.c

@@ -632,7 +632,7 @@ mongoc_database_has_collection (mongoc_database_t *database,
    }
 
 cleanup:
-   bson_free (infos);
+   bson_destroy (infos);
 
    RETURN (ret);
 }
@@ -740,7 +740,8 @@ mongoc_database_get_collection_info (mongoc_database_t *database,
                                      bson_error_t      *error)
 {
    mongoc_read_prefs_t *read_prefs;
-   bson_t *reply = bson_new();
+   bson_t *reply = NULL;
+   bson_t command_reply;
    bson_t cmd = BSON_INITIALIZER;
    bool cmd_success;
 
@@ -755,25 +756,22 @@ mongoc_database_get_collection_info (mongoc_database_t *database,
    read_prefs = mongoc_read_prefs_new (MONGOC_READ_PRIMARY);
 
    cmd_success = mongoc_database_command_simple (database, &cmd, read_prefs,
-                                                 reply, error);
+                                                 &command_reply, error);
    if (cmd_success) {
        /* intentionally empty */
+      reply = bson_copy(&command_reply);
    } else if (error->code == MONGOC_ERROR_QUERY_COMMAND_NOT_FOUND) {
-      bson_destroy (reply);
       /* We are talking to a server that doesn' support listCollections. */
       /* clear out the error. */
       error->code = 0;
       error->domain = 0;
       /* try again with using system.namespaces */
       reply =
          _mongoc_database_get_collection_info_legacy (database, filter, error);
-   } else {
-      /* network error */
-      bson_destroy (reply);
-      reply = NULL;
    }
 
    bson_destroy (&cmd);
+   bson_destroy (&command_reply);
    mongoc_read_prefs_destroy (read_prefs);
 
    return reply;

tests/test-bulk.c

@@ -353,6 +353,7 @@ test_bulk_edge_over_1000 (void)
    }
 
    mongoc_bulk_operation_destroy(bulk_op);
+   bson_destroy (&result);
 
    mongoc_write_concern_destroy(wc);
 

tests/test-mongoc-collection.c

@@ -1184,8 +1184,8 @@ test_get_index_info (void)
    bson_iter_t idx_spec_iter_copy;
    bool r;
    const char *cur_idx_name;
-   const char *idx1_name;
-   const char *idx2_name;
+   char *idx1_name = NULL;
+   char *idx2_name = NULL;
    const char *id_idx_name = "_id_";
    int num_idxs = 0;
 
@@ -1214,6 +1214,8 @@ test_get_index_info (void)
        }
    }
 
+   bson_destroy(indexinfo);
+
    /* insert a dummy document so that the collection actually exists */
    r = mongoc_collection_insert (collection, MONGOC_INSERT_NONE, &dummy, NULL,
                                  &error);
@@ -1307,6 +1309,9 @@ test_get_index_info (void)
 
    assert (3 == num_idxs);
 
+   bson_free (idx1_name);
+   bson_free (idx2_name);
+
    bson_destroy (indexinfo);
    mongoc_collection_destroy (collection);
    mongoc_client_destroy (client);

tests/test-mongoc-cursor.c

@@ -129,8 +129,6 @@ test_invalid_query (void)
 
    q = BCON_NEW ("foo", BCON_INT32 (1), "$orderby", "{", "}");
 
-   doc = q;
-
    cursor = _mongoc_cursor_new (client, "test.test", MONGOC_QUERY_NONE, 0, 1, 1,
                                 false, q, NULL, NULL);
    r = mongoc_cursor_next (cursor, &doc);
@@ -141,6 +139,7 @@ test_invalid_query (void)
    assert (error.code == MONGOC_ERROR_CURSOR_INVALID_CURSOR);
    assert (doc == NULL);
 
+   bson_destroy (q);
    mongoc_cursor_destroy (cursor);
    mongoc_client_destroy (client);
    mongoc_uri_destroy(uri);