Merge branch 'master' of github.com:mongodb/mongo-c-driver

bjori · bjori · commit ba46b5e68f95 · 2017-08-29T11:13:30.000-07:00
* 'master' of github.com:mongodb/mongo-c-driver: typo in mongoc_uri_t.rst typo in mongoc-config.h CDRIVER-2252 leak in mongoc_client_kill_cursors
diff --git a/doc/mongoc_uri_t.rst b/doc/mongoc_uri_t.rst
@@ -101,7 +101,7 @@ Mechanism Properties
 ========================================== ================================= =========================================================================================================================================================================================================================
 Constant                                   Key                               Description
 ========================================== ================================= =========================================================================================================================================================================================================================
-MONGOC_URI_CANONICALIZEHOSTNAME            canonicalizehostname              Use the canonical hostname of the service, rather then configured alias.
+MONGOC_URI_CANONICALIZEHOSTNAME            canonicalizehostname              Use the canonical hostname of the service, rather than configured alias.
 MONGOC_URI_GSSAPISERVICENAME               gssapiservicename                 Use alternative service name. The default is ``mongodb``.
 ========================================== ================================= =========================================================================================================================================================================================================================
 
diff --git a/src/mongoc/mongoc-client.c b/src/mongoc/mongoc-client.c
@@ -1843,6 +1843,7 @@ mongoc_client_kill_cursor (mongoc_client_t *client, int64_t cursor_id)
    if (!mongoc_topology_compatible (&topology->description, NULL, &error)) {
       MONGOC_ERROR ("Could not kill cursor: %s", error.message);
       mongoc_mutex_unlock (&topology->mutex);
+      mongoc_read_prefs_destroy (read_prefs);
       return;
    }
 
diff --git a/src/mongoc/mongoc-config.h.in b/src/mongoc/mongoc-config.h.in
@@ -137,7 +137,7 @@
 
 
 /*
- * Use ASN1_STRING_get0_data () rather then the deprecated ASN1_STRING_data
+ * Use ASN1_STRING_get0_data () rather than the deprecated ASN1_STRING_data
  */
 #define MONGOC_HAVE_ASN1_STRING_GET0_DATA @MONGOC_HAVE_ASN1_STRING_GET0_DATA@
 

Original file line number	Diff line number	Diff line change
`@@ -1843,6 +1843,7 @@ mongoc_client_kill_cursor (mongoc_client_t *client, int64_t cursor_id)`
`1843`	`1843`	`if (!mongoc_topology_compatible (&topology->description, NULL, &error)) {`
`1844`	`1844`	`MONGOC_ERROR ("Could not kill cursor: %s", error.message);`
`1845`	`1845`	`mongoc_mutex_unlock (&topology->mutex);`
	`1846`	`+ mongoc_read_prefs_destroy (read_prefs);`
`1846`	`1847`	`return;`
`1847`	`1848`	`}`
`1848`	`1849`