Remove static-ness of addr_mbox_to_udomain, and add tests

Fixes #1150

diff --git a/email/address.c b/email/address.c
index 2955ac7a15733d9641220f7070ed5882e12e0874..03a67c919b141208e48ec567e6b35deb7f60c44f 100644 (file)
--- a/email/address.c
+++ b/email/address.c
@@ -926,22 +926,20 @@ bool mutt_addr_is_local(struct Address *a)
  * @param[out] domain Domain
  * @retval 0  Success
  * @retval -1 Error
+ *
+ * @warning The caller must free user and domain
  */
 int mutt_addr_mbox_to_udomain(const char *mbox, char **user, char **domain)
 {
-  static char *buf = NULL;
-  char *p = NULL;
+  char *ptr = strchr(mbox, '@');
 
-  mutt_str_replace(&buf, mbox);
-  if (!buf)
+  /* Fail if '@' is missing, at the start, or at the end */
+  if (!ptr || (ptr == mbox) || (ptr[1] == '\0'))
     return -1;
 
-  p = strchr(buf, '@');
-  if (!p || !p[1])
-    return -1;
-  *p = '\0';
-  *user = buf;
-  *domain = p + 1;
+  *user = mutt_str_substr_dup(mbox, ptr);
+  *domain = mutt_str_strdup(ptr + 1);
+
   return 0;
 }
 
@@ -992,11 +990,18 @@ const char *mutt_addr_for_display(struct Address *a)
     return a->mailbox;
 
   local_mailbox = mutt_idna_intl_to_local(user, domain, MI_MAY_BE_IRREVERSIBLE);
+
+  FREE(&user);
+  FREE(&domain);
+
   if (!local_mailbox)
+  {
     return a->mailbox;
+  }
 
   mutt_str_replace(&buf, local_mailbox);
   FREE(&local_mailbox);
+
   return buf;
 }
 
@@ -1212,6 +1217,10 @@ int mutt_addrlist_to_intl(struct Address *a, char **err)
       continue;
 
     intl_mailbox = mutt_idna_local_to_intl(user, domain);
+
+    FREE(&user);
+    FREE(&domain);
+
     if (!intl_mailbox)
     {
       rc = -1;
@@ -1245,6 +1254,10 @@ int mutt_addrlist_to_local(struct Address *a)
       continue;
 
     local_mailbox = mutt_idna_intl_to_local(user, domain, 0);
+
+    FREE(&user);
+    FREE(&domain);
+
     if (local_mailbox)
       mutt_addr_set_local(a, local_mailbox);
   }

diff --git a/test/Makefile.autosetup b/test/Makefile.autosetup
index 09797b21e7c7c1d306f6daf402c5e87adeb5706d..b3fb7247e4f4a2abd744da3b25e4638be5f9d516 100644 (file)
--- a/test/Makefile.autosetup
+++ b/test/Makefile.autosetup
@@ -2,7 +2,8 @@ TEST_OBJS   = test/main.o \
              test/base64.o \
              test/md5.o \
              test/rfc2047.o \
-             test/string.o
+             test/string.o \
+             test/address.o
 
 
 CONFIG_OBJS    = test/config/main.o test/config/account.o \

diff --git a/test/address.c b/test/address.c
new file mode 100644 (file)
index 0000000..5336641
--- /dev/null
+++ b/test/address.c
@@ -0,0 +1,94 @@
+#define TEST_NO_MAIN
+#include "acutest.h"
+#include "acutest.h"
+#include "email/address.h"
+#include "mutt/memory.h"
+#include <string.h>
+
+#define TEST_CHECK_STR_EQ(expected, actual)                                    \
+  do                                                                           \
+  {                                                                            \
+    if (!TEST_CHECK(strcmp(expected, actual) == 0))                            \
+    {                                                                          \
+      TEST_MSG("Expected: %s", expected);                                      \
+      TEST_MSG("Actual  : %s", actual);                                        \
+    }                                                                          \
+  } while (false)
+
+void test_addr_mbox_to_udomain(void)
+{
+  { /* edge cases */
+    char *user = NULL;
+    char *domain = NULL;
+
+    if (!TEST_CHECK(mutt_addr_mbox_to_udomain("bobnodomain@", &user, &domain) == -1) ||
+        !TEST_CHECK(mutt_addr_mbox_to_udomain("bobnodomain", &user, &domain) == -1) ||
+        !TEST_CHECK(mutt_addr_mbox_to_udomain("@nobobohnoez", &user, &domain) == -1) ||
+        !TEST_CHECK(mutt_addr_mbox_to_udomain("", &user, &domain) == -1))
+    {
+      TEST_MSG("bad return");
+    }
+  }
+
+  { /* common */
+    int ret = 0;
+    const char *str = "bob@bobsdomain";
+
+    char *user = NULL;
+    char *domain = NULL;
+    ret = mutt_addr_mbox_to_udomain(str, &user, &domain);
+
+    if (!TEST_CHECK(ret == 0))
+    {
+      TEST_MSG("bad return");
+      TEST_MSG("Expected: %d", 0);
+      TEST_MSG("Actual  : %d", ret);
+    }
+
+    TEST_CHECK_STR_EQ("bob", user);
+    TEST_CHECK_STR_EQ("bobsdomain", domain);
+
+    FREE(&user);
+    FREE(&domain);
+  }
+
+  { /* integration */
+    char buf[256] = { 0 };
+    char *per = "bobby bob";
+    char *mbx = "bob@bobsdomain";
+
+    struct Address addr = {
+      .personal = per,
+      .mailbox = mbx,
+      .group = 0,
+      .next = NULL,
+      .is_intl = 0,
+      .intl_checked = 0,
+    };
+
+    mutt_addr_write_single(buf, sizeof(buf), &addr, false);
+
+    const char *expected = "bobby bob <bob@bobsdomain>";
+
+    TEST_CHECK_STR_EQ(expected, buf);
+  }
+
+  { /* integration */
+    char *per = "bobby bob";
+    char *mbx = "bob@bobsdomain";
+
+    struct Address addr = {
+      .personal = per,
+      .mailbox = mbx,
+      .group = 0,
+      .next = NULL,
+      .is_intl = 0,
+      .intl_checked = 0,
+    };
+
+    const char *expected = "bob@bobsdomain";
+    const char *actual = mutt_addr_for_display(&addr);
+
+    TEST_CHECK_STR_EQ(expected, actual);
+  }
+}

diff --git a/test/main.c b/test/main.c
index 47d73725ca26d4f1b21cf4bc2e9c3ca07a9d41ce..f64835159e28d3b0e7f4030a30fa76a5c7a27f6c 100644 (file)
--- a/test/main.c
+++ b/test/main.c
@@ -12,7 +12,8 @@
   NEOMUTT_TEST_ITEM(test_md5_ctx)                                              \
   NEOMUTT_TEST_ITEM(test_md5_ctx_bytes)                                        \
   NEOMUTT_TEST_ITEM(test_string_strfcpy)                                       \
-  NEOMUTT_TEST_ITEM(test_string_strnfcpy)
+  NEOMUTT_TEST_ITEM(test_string_strnfcpy)                                      \
+  NEOMUTT_TEST_ITEM(test_addr_mbox_to_udomain)
 
 /******************************************************************************
  * You probably don't need to touch what follows.