Skip to content

net/mail: fix EOF error while reading header-only message #47898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

net/mail: fix EOF error while reading header-only message #47898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
249ced1
net/mail: Fix EOF error while reading header-only message
0xc0d Aug 22, 2021
90fd186
net/mail: simplify the ReadMessage function
0xc0d Aug 22, 2021
4dbbbc4
net/mail: ensure there is at least one header
0xc0d Aug 23, 2021
356a942
net/mail: gofmt
0xc0d Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/net/mail/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func ReadMessage(r io.Reader) (msg *Message, err error) {
tp := textproto.NewReader(bufio.NewReader(r))

hdr, err := tp.ReadMIMEHeader()
if err != nil {
if err != nil && (err != io.EOF || len(hdr) == 0) {
return nil, err
}

Expand Down
13 changes: 13 additions & 0 deletions src/net/mail/message_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ So, "Hello".
},
body: "This is a message just to say hello.\nSo, \"Hello\".\n",
},
{
// RFC 5965, Appendix B.1, a part of the multipart message (a header-only sub message)
in: `Feedback-Type: abuse
User-Agent: SomeGenerator/1.0
Version: 1
`,
header: Header{
"Feedback-Type": []string{"abuse"},
"User-Agent": []string{"SomeGenerator/1.0"},
"Version": []string{"1"},
},
body: "",
},
}

func TestParsing(t *testing.T) {
Expand Down