X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=780b5f449c8e7ccb022b0e7338d977b88daeb424;hp=d682318bfb3b2f3301729b5c3caccf9167a679e2;hb=054c8779d6660afe45f38fa04510c2061aa6a605;hpb=1d8a8014d875169c468341a66a5a7773c845577e

diff --git a/uip/spost.c b/uip/spost.c
index d682318..780b5f4 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -357,7 +357,8 @@ putfmt(char *name, char *str, FILE *out)
 	int i;
 	struct headers *hdr;
 	struct mailname addr_start, *addr_end;
-	size_t addrc;
+	size_t addrc = 0;
+	ssize_t ret;
 
 	addr_end = &addr_start;
 	addr_end->m_next = NULL;
@@ -411,7 +412,11 @@ putfmt(char *name, char *str, FILE *out)
 		return;
 	}
 
-	addrc = getmboxes(str, &addr_end);
+	if ((ret = getmboxes(str, &addr_end)) < 0) {
+		adios(EX_DATAERR, NULL, "can't parse address: %s", str);
+	}
+
+	addrc += ret;
 
 	if (aliasflg) {
 		addrc += do_aliasing(&addr_start, &addr_end);
@@ -426,7 +431,6 @@ putfmt(char *name, char *str, FILE *out)
 	if (hdr->set & MFRM) {
 		struct mailname *mp = NULL;
 		struct mailname *my = NULL;
-		unsigned int fromcnt = 0;
 
 		/* needed because the address parser holds global state */
 		ismymbox(NULL);
@@ -438,10 +442,9 @@ putfmt(char *name, char *str, FILE *out)
 					my = mp;
 				}
 			}
-			fromcnt++;
 		}
 
-		if (fromcnt > 1) {
+		if (addrc > 1) {
 			sender = my;
 		}
 	}
@@ -680,6 +683,7 @@ do_aliasing(struct mailname *start, struct mailname **end)
 	struct mailname *prev, *cur;
 	char *cp;
 	size_t i = 0;
+	ssize_t e;
 
 	prev = start;
 	cur = prev->m_next;
@@ -689,7 +693,10 @@ do_aliasing(struct mailname *start, struct mailname **end)
 			cp = akvalue(cur->m_mbox);
 			if (strcmp(cp, cur->m_mbox) != 0) {
 				prev->m_next = cur->m_next;
-				i += getmboxes(cp, &prev);
+				if ((e = getmboxes(cp, &prev)) < 0) {
+					goto error;
+				}
+				i += e;
 				i -= 1;
 				mnfree(cur);
 			} else {
@@ -702,4 +709,7 @@ do_aliasing(struct mailname *start, struct mailname **end)
 	}
 	*end = prev;
 	return i;
+error:
+	adios(EX_CONFIG, NULL, "can't parse alias %s: %s", cur->m_mbox, cp);
+	return 0; /* not reached */
 }