Skip to content

Commit fe470f8

Browse files
committed
Fix potential issues found by CodeQL
Change-Id: I6693b015826c70bb12621f99180fddce072b9ccf Reviewed-on: https://review.couchbase.org/c/libcouchbase/+/224708 Reviewed-by: Jared Casey <jared.casey@couchbase.com> Tested-by: Build Bot <build@couchbase.com>
1 parent 828db73 commit fe470f8

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

contrib/cbsasl/src/client.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,11 @@ cbsasl_error_t cbsasl_client_step(cbsasl_conn_t *conn, const char *serverin, uns
335335
break;
336336
}
337337
*clientout = conn->c.client.userdata;
338-
*clientoutlen = strlen(conn->c.client.userdata);
338+
if (conn->c.client.userdata != NULL) {
339+
*clientoutlen = strlen(conn->c.client.userdata);
340+
} else {
341+
*clientoutlen = 0;
342+
}
339343

340344
return SASL_CONTINUE;
341345
}

src/cntl.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,9 @@ HANDLER(force_sasl_mech_handler)
384384
if (arg) {
385385
const char *s = reinterpret_cast<const char *>(arg);
386386
instance->settings->sasl_mech_force = lcb_strdup(s);
387+
if (instance->settings->sasl_mech_force == nullptr) {
388+
return LCB_ERR_NO_MEMORY;
389+
}
387390
for (char *p = instance->settings->sasl_mech_force; *p != '\0'; p++) {
388391
if (*p == ',') {
389392
*p = ' ';

tests/iotests/t_get.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ TEST_F(GetUnitTest, testGetReplicaWithGroups)
13821382
number_of_nodes = instance->cmdq.config->nsrv;
13831383
if (number_of_nodes <= static_cast<std::size_t>(number_of_replicas)) {
13841384
char buf[256]{};
1385-
snprintf(buf, 256, "number of nodes (%d) is less or equal to number of replicas",
1385+
snprintf(buf, 256, "number of nodes (%d) is less or equal to number of replicas (%d)",
13861386
static_cast<int>(number_of_nodes), number_of_replicas);
13871387
MockEnvironment::printSkipMessage(__FILE__, __LINE__, buf);
13881388
return;

0 commit comments

Comments
 (0)