X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fmf.c;h=c86d4d5dd0f26e1d52545cee072b265d390fb32f;hp=633522b804eb72a0c51abfc24111c27b78e801ed;hb=d4bcca1aa235370bc20bc2734c0cd6f700b17871;hpb=5ba9c2f13fedf1d8d6ed907ef1f505616290efaa

diff --git a/sbr/mf.c b/sbr/mf.c
index 633522b..c86d4d5 100644
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -42,7 +42,7 @@ getcpy(char *s)
 		for(;;)
 			pause();
 	}
-	p = mh_xmalloc((size_t) (strlen(s) + 2));
+	p = mh_xcalloc(strlen(s) + 2, sizeof(char));
 	strcpy(p, s);
 	return p;
 }
@@ -168,33 +168,31 @@ getadrx(char *addrs)
 	struct adrx *adrxp = &adrxs2;
 
 	if (pers)
-		free(pers);
+		mh_free0(&pers);
 	if (mbox)
-		free(mbox);
+		mh_free0(&mbox);
 	if (host)
-		free(host);
+		mh_free0(&host);
 	if (path)
-		free(path);
+		mh_free0(&path);
 	if (grp)
-		free(grp);
+		mh_free0(&grp);
 	if (note)
-		free(note);
-	pers = mbox = host = path = grp = note = NULL;
+		mh_free0(&note);
 	err[0] = 0;
 
 	if (dp == NULL) {
 		dp = cp = getcpy(addrs ? addrs : "");
 		glevel = 0;
 	} else if (cp == NULL) {
-		free(dp);
-		dp = NULL;
+		mh_free0(&dp);
 		return NULL;
 	}
 
 	switch (parse_address()) {
 	case DONE:
-		free(dp);
-		dp = cp = NULL;
+		mh_free0(&dp);
+		cp = NULL;
 		return NULL;
 
 	case OK:
@@ -272,8 +270,7 @@ again: ;
 		}
 	case LX_COMA:
 		if (note) {
-			free(note);
-			note = NULL;
+			mh_free0(&note);
 		}
 		goto again;
 
@@ -501,8 +498,7 @@ domain(char *buffer)
 
 		case LX_AT:  /* sigh (0) */
 			mbox = add(host, add("%", mbox));
-			free(host);
-			host = NULL;
+			mh_free0(&host);
 			continue;
 
 		default: