X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=78fe7bee3a403366a1618330a4bc65dfdebd6127;hp=4b42e32e42025238d8b94c30d5d7661264d95fc1;hb=13b3b36c8f696aea26b7c60444f2baa4858b004d;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/mutt_idna.c b/mutt_idna.c
index 4b42e32..78fe7be 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -12,6 +12,7 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
 #include "charset.h"
 #include "mutt_idna.h"
 
@@ -73,8 +74,8 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
       irrev = 1;
     }
 
-    FREE (&t2);
-    FREE (&tmp);
+    mem_free (&t2);
+    mem_free (&tmp);
 
     if (irrev)
       goto notrans;
@@ -83,7 +84,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
   return 0;
 
 notrans:
-  FREE (out);
+  mem_free (out);
   *out = str_dup (in);
   return 1;
 }
@@ -105,9 +106,9 @@ int mutt_local_to_idna (const char *in, char **out)
   if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
     rv = -2;
 
-  FREE (&tmp);
+  mem_free (&tmp);
   if (rv < 0) {
-    FREE (out);
+    mem_free (out);
     *out = str_dup (in);
   }
   return rv;
@@ -126,9 +127,9 @@ static int mbox_to_udomain (const char *mbx, char **user, char **domain)
   *domain = NULL;
 
   p = strchr (mbx, '@');
-  if (!p)
+  if (!p || !p[1])
     return -1;
-  *user = safe_calloc ((p - mbx + 1), sizeof (mbx[0]));
+  *user = mem_calloc ((p - mbx + 1), sizeof (mbx[0]));
   strfcpy (*user, mbx, (p - mbx + 1));
   *domain = str_dup (p + 1);
   return 0;
@@ -155,13 +156,13 @@ int mutt_addrlist_to_idna (ADDRESS * a, char **err)
         *err = str_dup (domain);
     }
     else {
-      safe_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
+      mem_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
     }
 
-    FREE (&domain);
-    FREE (&user);
-    FREE (&tmp);
+    mem_free (&domain);
+    mem_free (&user);
+    mem_free (&tmp);
 
     if (e)
       return -1;
@@ -182,13 +183,13 @@ int mutt_addrlist_to_local (ADDRESS * a)
       continue;
 
     if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
-      safe_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
+      mem_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
     }
 
-    FREE (&domain);
-    FREE (&user);
-    FREE (&tmp);
+    mem_free (&domain);
+    mem_free (&user);
+    mem_free (&tmp);
   }
 
   return 0;
@@ -205,22 +206,22 @@ const char *mutt_addr_for_display (ADDRESS * a)
   char *domain = NULL;
   char *user = NULL;
 
-  FREE (&buff);
+  mem_free (&buff);
 
   if (mbox_to_udomain (a->mailbox, &user, &domain) != 0)
     return a->mailbox;
   if (mutt_idna_to_local (domain, &tmp, MI_MAY_BE_IRREVERSIBLE) != 0) {
-    FREE (&user);
-    FREE (&domain);
-    FREE (&tmp);
+    mem_free (&user);
+    mem_free (&domain);
+    mem_free (&tmp);
     return a->mailbox;
   }
 
-  safe_realloc (&buff, str_len (tmp) + str_len (user) + 2);
+  mem_realloc (&buff, str_len (tmp) + str_len (user) + 2);
   sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
-  FREE (&tmp);
-  FREE (&user);
-  FREE (&domain);
+  mem_free (&tmp);
+  mem_free (&user);
+  mem_free (&domain);
   return buff;
 }