Module: ngircd.git Branch: master Commit: 3b65f4e38d1ab019513f16b70581ae10574006e8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3b65f...

Author: Federico G. Schwindt fgsch@lodoss.net Date: Mon Aug 26 12:18:46 2013 +0100

Change strdup() to strndup()

---

src/ngircd/client.c | 3 ++- src/ngircd/conn-ssl.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1c71034..72774ca 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -469,7 +469,8 @@ Client_SetAccountName(CLIENT *Client, const char *AccountName) free(Client->account_name);

if (*AccountName) - Client->account_name = strdup(AccountName); + Client->account_name = strndup(AccountName, + CLIENT_NICK_LEN - 1); else Client->account_name = NULL; } diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 4156fb1..096ff95 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -61,7 +61,7 @@ static gnutls_dh_params_t dh_params; static bool ConnSSL_LoadServerKey_gnutls PARAMS(( void )); #endif

-#define CERTFP_LEN (20 * 2 + 1) +#define SHA1_STRING_LEN (20 * 2 + 1)

static bool ConnSSL_Init_SSL PARAMS(( CONNECTION *c )); static int ConnectAccept PARAMS(( CONNECTION *c, bool connect )); @@ -723,7 +723,7 @@ ConnSSL_InitCertFp( CONNECTION *c )

assert(c->ssl_state.fingerprint == NULL);

- c->ssl_state.fingerprint = malloc(CERTFP_LEN); + c->ssl_state.fingerprint = malloc(SHA1_STRING_LEN); if (!c->ssl_state.fingerprint) return 0;

@@ -858,7 +858,7 @@ bool ConnSSL_SetCertFp(CONNECTION *c, const char *fingerprint) { assert (c != NULL); - c->ssl_state.fingerprint = strdup(fingerprint); + c->ssl_state.fingerprint = strndup(fingerprint, SHA1_STRING_LEN - 1); return c->ssl_state.fingerprint != NULL; } #else