From 2bd6360e3b0bda74b637ad37536b2f95f5b8574f Mon Sep 17 00:00:00 2001 From: Hiroshi Ioka Date: Wed, 8 Mar 2017 07:47:31 +0900 Subject: [PATCH] net/mail: fix wrong error message in consumePhrase Fixes #19415 Change-Id: I6414f82e42bd09f1793156befce326aeac919ea2 Reviewed-on: https://go-review.googlesource.com/37911 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/net/mail/message.go | 2 +- src/net/mail/message_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/net/mail/message.go b/src/net/mail/message.go index 6db8a397e9..765abe2521 100644 --- a/src/net/mail/message.go +++ b/src/net/mail/message.go @@ -393,7 +393,7 @@ func (p *addrParser) consumePhrase() (phrase string, err error) { var word string p.skipSpace() if p.empty() { - return "", errors.New("mail: missing phrase") + break } isEncoded := false if p.peek() == '"' { diff --git a/src/net/mail/message_test.go b/src/net/mail/message_test.go index 0ed36b02f8..2106a0b97d 100644 --- a/src/net/mail/message_test.go +++ b/src/net/mail/message_test.go @@ -136,6 +136,7 @@ func TestAddressParsingError(t *testing.T) { 4: {"\"\\" + string([]byte{0x80}) + "\" ", "invalid utf-8 in quoted-string"}, 5: {"\"\x00\" ", "bad character in quoted-string"}, 6: {"\"\\\x00\" ", "bad character in quoted-string"}, + 7: {"John Doe", "no angle-addr"}, } for i, tc := range mustErrTestCases { -- 2.48.1