Fix empty errors if mongoc_database_remove_user\mongoc_database_remove_all_users fails

alexeyvo · hanumantmk · commit f4e5adb3919a · 2015-01-07T17:40:55.000-05:00
Closes #146
diff --git a/src/mongoc/mongoc-database.c b/src/mongoc/mongoc-database.c
@@ -331,6 +331,8 @@ mongoc_database_remove_user (mongoc_database_t *database,
 
       bson_destroy (&cmd);
       mongoc_collection_destroy (col);
+   } else if (error) {
+      memcpy (error, &lerror, sizeof *error);
    }
 
    RETURN (ret);
@@ -367,6 +369,8 @@ mongoc_database_remove_all_users (mongoc_database_t *database,
 
       bson_destroy (&cmd);
       mongoc_collection_destroy (col);
+   } else if (error) {
+      memcpy (error, &lerror, sizeof *error);
    }
 
    RETURN (ret);

Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,8 @@ mongoc_database_remove_user (mongoc_database_t *database,`
`331`	`331`
`332`	`332`	`bson_destroy (&cmd);`
`333`	`333`	`mongoc_collection_destroy (col);`
	`334`	`+ } else if (error) {`
	`335`	`+ memcpy (error, &lerror, sizeof *error);`
`334`	`336`	`}`
`335`	`337`
`336`	`338`	`RETURN (ret);`
`@@ -367,6 +369,8 @@ mongoc_database_remove_all_users (mongoc_database_t *database,`
`367`	`369`
`368`	`370`	`bson_destroy (&cmd);`
`369`	`371`	`mongoc_collection_destroy (col);`
	`372`	`+ } else if (error) {`
	`373`	`+ memcpy (error, &lerror, sizeof *error);`
`370`	`374`	`}`
`371`	`375`
`372`	`376`	`RETURN (ret);`