Skip to content

Commit af3e4cd

Browse files
committed
Unconditionally destroy ts->api
1 parent 7dd365e commit af3e4cd

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

src/libmongoc/src/mongoc/mongoc-topology-scanner.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,7 @@ mongoc_topology_scanner_destroy (mongoc_topology_scanner_t *ts)
419419
bson_destroy (&ts->ismaster_cmd);
420420
bson_destroy (&ts->ismaster_cmd_with_handshake);
421421
bson_destroy (&ts->cluster_time);
422-
423-
if (ts->api) {
424-
mongoc_server_api_destroy (ts->api);
425-
}
422+
mongoc_server_api_destroy (ts->api);
426423

427424
/* This field can be set by a mongoc_client */
428425
bson_free ((char *) ts->appname);
@@ -1354,15 +1351,10 @@ void
13541351
_mongoc_topology_scanner_set_server_api (mongoc_topology_scanner_t *ts,
13551352
const mongoc_server_api_t *api)
13561353
{
1357-
mongoc_server_api_t *prev_api;
1358-
1354+
BSON_ASSERT (ts);
13591355
BSON_ASSERT (api);
13601356

1361-
prev_api = ts->api;
1357+
mongoc_server_api_destroy (ts->api);
13621358
ts->api = mongoc_server_api_copy (api);
13631359
_reset_ismaster (ts);
1364-
1365-
if (prev_api) {
1366-
mongoc_server_api_destroy (prev_api);
1367-
}
13681360
}

0 commit comments

Comments
 (0)