From: Timo Sirainen <tss@iki.fi>
Date: Sun, 7 Sep 2008 16:50:23 +0000 (+0300)
Subject: message address parser: Check better if adress is invalid and set invalid_syntax.
X-Git-Tag: 1.2.alpha2~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9731b64db784dc89e023c9d7f7c449bd79051d68;p=thirdparty%2Fdovecot%2Fcore.git

message address parser: Check better if adress is invalid and set invalid_syntax.

--HG--
branch : HEAD
---

diff --git a/src/lib-mail/message-address.c b/src/lib-mail/message-address.c
index 2b284a6277..29f0117b33 100644
--- a/src/lib-mail/message-address.c
+++ b/src/lib-mail/message-address.c
@@ -108,7 +108,7 @@ static int parse_angle_addr(struct message_address_parser_context *ctx)
 
 	if (*ctx->parser.data == '@') {
 		if (parse_domain_list(ctx) <= 0 || *ctx->parser.data != ':') {
-			ctx->addr.route = p_strdup(ctx->pool, "INVALID_ROUTE");
+			ctx->addr.route = "INVALID_ROUTE";
 			return -1;
 		}
 		ctx->parser.data++;
@@ -148,7 +148,8 @@ static int parse_name_addr(struct message_address_parser_context *ctx)
 	}
 	if (parse_angle_addr(ctx) < 0) {
 		/* broken */
-		ctx->addr.domain = p_strdup(ctx->pool, "SYNTAX_ERROR");
+		ctx->addr.domain = "SYNTAX_ERROR";
+		ctx->addr.invalid_syntax = TRUE;
 	}
 	return ctx->parser.data != ctx->parser.end;
 }
@@ -176,10 +177,14 @@ static int parse_addr_spec(struct message_address_parser_context *ctx)
 
 static void add_fixed_address(struct message_address_parser_context *ctx)
 {
-	if (ctx->addr.mailbox == NULL)
+	if (ctx->addr.mailbox == NULL) {
 		ctx->addr.mailbox = !ctx->fill_missing ? "" : "MISSING_MAILBOX";
-	if (ctx->addr.domain == NULL)
+		ctx->addr.invalid_syntax = TRUE;
+	}
+	if (ctx->addr.domain == NULL) {
 		ctx->addr.domain = !ctx->fill_missing ? "" : "MISSING_DOMAIN";
+		ctx->addr.invalid_syntax = TRUE;
+	}
 	add_address(ctx);
 }