X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.c;h=6bc3a295606612f546c60c7ccf2fb846e2b99ea1;hp=45fbf8751b6bcd69a0d56a335b7b5eecb127e9ff;hb=0f44dc85fc1280372ffab911d701e703d803fb4b;hpb=1106413431b72d14d6f1208d611c489931ea4499 diff --git a/mutt_sasl.c b/mutt_sasl.c index 45fbf87..6bc3a29 100644 --- a/mutt_sasl.c +++ b/mutt_sasl.c @@ -131,7 +131,7 @@ static int iptostring (const struct sockaddr *addr, socklen_t addrlen, if (ret) return getnameinfo_err (ret); - if (outlen < mutt_strlen (hbuf) + mutt_strlen (pbuf) + 2) + if (outlen < safe_strlen (hbuf) + safe_strlen (pbuf) + 2) return SASL_BUFOVER; snprintf (out, outlen, "%s;%s", hbuf, pbuf); @@ -399,7 +399,7 @@ int mutt_sasl_interact (sasl_interact_t * interaction) if (mutt_get_field (prompt, resp, sizeof (resp), 0)) return SASL_FAIL; - interaction->len = mutt_strlen (resp) + 1; + interaction->len = safe_strlen (resp) + 1; interaction->result = safe_malloc (interaction->len); memcpy (interaction->result, resp, interaction->len); @@ -501,7 +501,7 @@ static int mutt_sasl_cb_authname (void *context, int id, const char **result, *result = account->user; if (len) - *len = mutt_strlen (*result); + *len = safe_strlen (*result); return SASL_OK; } @@ -522,7 +522,7 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id, if (mutt_account_getpass (account)) return SASL_FAIL; - len = mutt_strlen (account->pass); + len = safe_strlen (account->pass); *psecret = (sasl_secret_t *) safe_malloc (sizeof (sasl_secret_t) + len); (*psecret)->len = len;