X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_sasl.c;h=e0fbfba3a28cce6bf6817562cf1dd5370fafb5a8;hp=075e4b548e2f45b3dc9aae274fff43f89e8578ae;hb=841a368ddea400022328f35dd8c7a3eb6f543892;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 075e4b5..e0fbfba 100644
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -129,10 +129,10 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
     if (irc == IMAP_CMD_RESPOND) {
 #ifdef USE_SASL2
       if (sasl_decode64
-          (idata->cmd.buf + 2, safe_strlen (idata->cmd.buf + 2), buf,
+          (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
            LONG_STRING - 1,
 #else
-      if (sasl_decode64 (idata->cmd.buf + 2, safe_strlen (idata->cmd.buf + 2), buf,
+      if (sasl_decode64 (idata->cmd.buf + 2, str_len (idata->cmd.buf + 2), buf,
 #endif
                          &len) != SASL_OK) {
         debug_print (1, ("error base64-decoding server response.\n"));
@@ -161,7 +161,7 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA * idata, const char *method)
       /* sasl_client_st(art|ep) allocate pc with malloc, expect me to 
        * free it */
 #ifndef USE_SASL2
-      FREE (&pc);
+      mem_free (&pc);
 #endif
     }