From 0e6fa09d7e9062db82b0d682d896ce8830df7dd2 Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Wed, 19 Nov 2014 16:01:38 +0000 Subject: [PATCH] Fixes for Coverity issues --- server/core/secrets.c | 2 +- server/modules/protocol/maxscaled.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/core/secrets.c b/server/core/secrets.c index b05f47ebe..2dcd4567d 100644 --- a/server/core/secrets.c +++ b/server/core/secrets.c @@ -363,7 +363,7 @@ unsigned char encrypted[80]; return NULL; memset(padded_passwd, 0, 80); - strcpy((char *)padded_passwd, password); + strncpy((char *)padded_passwd, password, 80); padded_len = ((strlen(password) / AES_BLOCK_SIZE) + 1) * AES_BLOCK_SIZE; AES_set_encrypt_key(keys->enckey, 8 * MAXSCALE_KEYLEN, &aeskey); diff --git a/server/modules/protocol/maxscaled.c b/server/modules/protocol/maxscaled.c index 89fd19535..1c564da56 100644 --- a/server/modules/protocol/maxscaled.c +++ b/server/modules/protocol/maxscaled.c @@ -356,7 +356,13 @@ int rc; } // socket options - setsockopt(listener->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)); + if (setsockopt(listener->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one))) + { + LOGIF(LE, (skygw_log_write( + LOGFILE_ERROR, + "Unable to set SO_REUSEADDR on maxscale listener." + ))); + } // set NONBLOCKING mode setnonblocking(listener->fd); // bind address and port