X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b24a1b1ac51ca3bbacc82700dd1388b7dae2633d..803f25412:/sbr/addrsbr.c?ds=inline

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index b2079bd2..23a7cb4c 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -11,6 +11,7 @@
 #include <h/addrsbr.h>
 #include <h/mf.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 /* High level parsing of addresses:
 
@@ -138,7 +139,7 @@ getm (char *str, char *dfhost, int dftype, char *eresult, size_t eresultsize)
 	dftype = LOCALHOST;
     }
 
-    mp = (struct mailname *) calloc ((size_t) 1, sizeof(*mp));
+    mp = (struct mailname *) mh_xcalloc ((size_t) 1, sizeof(*mp));
     if (mp == NULL) {
 	if (eresult) {
 	    strncpy (eresult, "insufficient memory to represent address",
@@ -436,7 +437,7 @@ local_test: ;
 
 	if (mp->m_nohost)
 	    return 1;
-	if (np->m_host == NULL)
+	if (np->m_host == NULL || mp->m_host == NULL)
 	    continue;
 	if ((len = strlen (cp = np->m_host))
 		< (i = strlen (pp = mp->m_host)))