Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-18 18:17:03 +00:00
Code Issues Releases Wiki Activity

Fix a couple defered Close() operations

Browse Source
This commit is contained in:
James Hillyerd
2014-01-20 14:32:58 -08:00
parent b105bbf87f
commit 8f10e18fef
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.goxc.json
View File

@@ -8,6 +8,6 @@
"Include": "README*,LICENSE*,inbucket.bat,etc,themes" "Include": "README*,LICENSE*,inbucket.bat,etc,themes"
}, },
"PackageVersion": "1.0", "PackageVersion": "1.0",
"PrereleaseInfo": "rc2", "PrereleaseInfo": "rc3",
"FormatVersion": "0.8" "FormatVersion": "0.8"
} }

4
pop3d/handler.go
View File

@@ -425,12 +425,12 @@ func (ses *Session) transactionHandler(cmd string, args []string) {
// Send the contents of the message to the client // Send the contents of the message to the client
func (ses *Session) sendMessage(msg smtpd.Message) { func (ses *Session) sendMessage(msg smtpd.Message) {
reader, err := msg.RawReader() reader, err := msg.RawReader()
defer reader.Close()
if err != nil { if err != nil {
ses.logError("Failed to read message for RETR command") ses.logError("Failed to read message for RETR command")
ses.send("-ERR Failed to RETR that message, internal error") ses.send("-ERR Failed to RETR that message, internal error")
return return
} }
defer reader.Close()
scanner := bufio.NewScanner(reader) scanner := bufio.NewScanner(reader)
for scanner.Scan() { for scanner.Scan() {
line := scanner.Text() line := scanner.Text()
@@ -453,12 +453,12 @@ func (ses *Session) sendMessage(msg smtpd.Message) {
// Send the headers plus the top N lines to the client // Send the headers plus the top N lines to the client
func (ses *Session) sendMessageTop(msg smtpd.Message, lineCount int) { func (ses *Session) sendMessageTop(msg smtpd.Message, lineCount int) {
reader, err := msg.RawReader() reader, err := msg.RawReader()
defer reader.Close()
if err != nil { if err != nil {
ses.logError("Failed to read message for RETR command") ses.logError("Failed to read message for RETR command")
ses.send("-ERR Failed to RETR that message, internal error") ses.send("-ERR Failed to RETR that message, internal error")
return return
} }
defer reader.Close()
scanner := bufio.NewScanner(reader) scanner := bufio.NewScanner(reader)
inBody := false inBody := false
for scanner.Scan() { for scanner.Scan() {