Merge pull request #254 from canella/master

Removed memory leak in function mongoc_database_has_collection
mongodb · Nov 26, 2015 · a556f6b · a556f6b
2 parents ceef394 + e9c97ce
commit a556f6b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/mongoc/mongoc-database.c b/src/mongoc/mongoc-database.c
@@ -708,13 +708,16 @@ mongoc_database_has_collection (mongoc_database_t *database,
    BSON_APPEND_UTF8 (&filter, "name", name);
 
    cursor = mongoc_database_find_collections (database, &filter, error);
-
-   if (!cursor ||
-       (error &&
-        ((error->domain != 0) ||
-         (error->code != 0)))) {
+
+   if (!cursor) {
       return ret;
    }
+
+   if (error &&
+        ((error->domain != 0) ||
+         (error->code != 0))) {
+      GOTO (cleanup);
+   }
 
    while (mongoc_cursor_next (cursor, &doc)) {
       if (bson_iter_init (&col_iter, doc) &&