X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=6c341a6124dcb2118550ee04b085015ce761d7e6;hp=1f9da6c8f08d03251a5009cffd3bf6983b0c2a0d;hb=972ceaccdfed1c8c4a665b2ecb9683d140fdeda2;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/mutt_idna.c b/mutt_idna.c
index 1f9da6c..6c341a6 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -15,6 +15,10 @@
 #include "charset.h"
 #include "mutt_idna.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 /* The low-level interface we use. */
 
 #ifndef HAVE_LIBIDN
@@ -153,7 +157,7 @@ int mutt_addrlist_to_idna (ADDRESS * a, char **err)
         *err = safe_strdup (domain);
     }
     else {
-      safe_realloc (&a->mailbox, mutt_strlen (user) + mutt_strlen (tmp) + 2);
+      safe_realloc (&a->mailbox, safe_strlen (user) + safe_strlen (tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
     }
 
@@ -180,7 +184,7 @@ int mutt_addrlist_to_local (ADDRESS * a)
       continue;
 
     if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
-      safe_realloc (&a->mailbox, mutt_strlen (user) + mutt_strlen (tmp) + 2);
+      safe_realloc (&a->mailbox, safe_strlen (user) + safe_strlen (tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
     }
 
@@ -214,7 +218,7 @@ const char *mutt_addr_for_display (ADDRESS * a)
     return a->mailbox;
   }
 
-  safe_realloc (&buff, mutt_strlen (tmp) + mutt_strlen (user) + 2);
+  safe_realloc (&buff, safe_strlen (tmp) + safe_strlen (user) + 2);
   sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
   FREE (&tmp);
   FREE (&user);