X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futf7.c;fp=imap%2Futf7.c;h=589a661655376c41e59f5468e98743e40342494f;hb=a8477ebaa09990b3688164cbe5cf661c4189541d;hp=bc5571a5bf001ae66d1b800f9285dbb60ccd5315;hpb=e01486aabea6f0af36933158bd58b9ab03b30add;p=apps%2Fmadmutt.git

diff --git a/imap/utf7.c b/imap/utf7.c
index bc5571a..589a661 100644
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -232,10 +232,10 @@ bail:
 void imap_utf7_encode (char **s)
 {
   if (Charset) {
-    char *t = safe_strdup (*s);
+    char *t = str_dup (*s);
 
     if (!mutt_convert_string (&t, Charset, "UTF-8", 0))
-      utf8_to_utf7 (t, mutt_strlen (t), s, 0);
+      utf8_to_utf7 (t, str_len (t), s, 0);
     FREE (&t);
   }
 }
@@ -243,7 +243,7 @@ void imap_utf7_encode (char **s)
 void imap_utf7_decode (char **s)
 {
   if (Charset) {
-    char *t = utf7_to_utf8 (*s, mutt_strlen (*s), 0, 0);
+    char *t = utf7_to_utf8 (*s, str_len (*s), 0, 0);
 
     if (t && !mutt_convert_string (&t, "UTF-8", Charset, 0)) {
       FREE (s);