Skip to content

Fix concurrency issue in handling headers (gomail.v1). #201

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

Open
uakfdotb wants to merge 1 commit into
base: v1
Choose a base branch
from
Open

Fix concurrency issue in handling headers (gomail.v1). #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 1 addition & 21 deletions gomail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"io/ioutil"
"mime"
"path/filepath"
"sync"
"time"

"gopkg.in/alexcesaro/quotedprintable.v2"
Expand Down Expand Up @@ -131,8 +130,7 @@ func (msg *Message) SetAddressHeader(field, address, name string) {

// FormatAddress formats an address and a name as a valid RFC 5322 address.
func (msg *Message) FormatAddress(address, name string) string {
buf := getBuffer()
defer putBuffer(buf)
buf := new(bytes.Buffer)

if !quotedprintable.NeedsEncoding(name) {
quote(buf, name)
Expand Down Expand Up @@ -314,21 +312,3 @@ func encodeHeader(enc *quotedprintable.HeaderEncoder, value string) string {

return enc.Encode(value)
}

var bufPool = sync.Pool{
New: func() interface{} {
return new(bytes.Buffer)
},
}

func getBuffer() *bytes.Buffer {
return bufPool.Get().(*bytes.Buffer)
}

func putBuffer(buf *bytes.Buffer) {
if buf.Len() > 1024 {
return
}
buf.Reset()
bufPool.Put(buf)
}
4 changes: 2 additions & 2 deletions mailer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gomail

import (
"bytes"
"crypto/tls"
"errors"
"fmt"
Expand Down Expand Up @@ -124,8 +125,7 @@ func (m *Mailer) Send(msg *Message) error {
}

func flattenHeader(msg *mail.Message, bcc string) []byte {
buf := getBuffer()
defer putBuffer(buf)
buf := new(bytes.Buffer)

for field, value := range msg.Header {
if field != "Bcc" {
Expand Down