wneessen/go-mail
1
1
Fork 0
mirror of https://github.com/wneessen/go-mail.git synced 2024-09-19 18:52:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #122 from wneessen/121-using-defer-inside-for-loop-could-lead-to-leaks

Browse source 
Remove defer from for loops
This commit is contained in:
Winni Neessen 2023-03-15 18:51:58 +01:00 committed by GitHub
commit 89fd5dfa06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
smtp/smtp_test.go
View file

@ -808,13 +808,7 @@ func TestHello(t *testing.T) {
t.Fatalf("Hello server and client size mismatch") t.Fatalf("Hello server and client size mismatch")
} }
for i := 0; i < len(helloServer); i++ { tf := func(fake faker, i int) error {
server := strings.Join(strings.Split(baseHelloServer+helloServer[i], "\n"), "\r\n")
client := strings.Join(strings.Split(baseHelloClient+helloClient[i], "\n"), "\r\n")
var cmdbuf strings.Builder
bcmdbuf := bufio.NewWriter(&cmdbuf)
var fake faker
fake.ReadWriter = bufio.NewReadWriter(bufio.NewReader(strings.NewReader(server)), bcmdbuf)
c, err := NewClient(fake, "fake.host") c, err := NewClient(fake, "fake.host")
if err != nil { if err != nil {
t.Fatalf("NewClient: %v", err) t.Fatalf("NewClient: %v", err)
@ -871,6 +865,20 @@ func TestHello(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Command %d failed: %v", i, err) t.Errorf("Command %d failed: %v", i, err)
} }
return nil
}
for i := 0; i < len(helloServer); i++ {
server := strings.Join(strings.Split(baseHelloServer+helloServer[i], "\n"), "\r\n")
client := strings.Join(strings.Split(baseHelloClient+helloClient[i], "\n"), "\r\n")
var cmdbuf strings.Builder
bcmdbuf := bufio.NewWriter(&cmdbuf)
var fake faker
fake.ReadWriter = bufio.NewReadWriter(bufio.NewReader(strings.NewReader(server)), bcmdbuf)
if err := tf(fake, i); err != nil {
t.Error(err)
}
if err := bcmdbuf.Flush(); err != nil { if err := bcmdbuf.Flush(); err != nil {
t.Errorf("flush failed: %s", err) t.Errorf("flush failed: %s", err)
@ -1241,6 +1249,13 @@ func serverHandle(c net.Conn, t *testing.T) error {
send := smtpSender{c}.send send := smtpSender{c}.send
send("220 127.0.0.1 ESMTP service ready") send("220 127.0.0.1 ESMTP service ready")
s := bufio.NewScanner(c) s := bufio.NewScanner(c)
tf := func(config *tls.Config) error {
c = tls.Server(c, config)
defer func() {
_ = c.Close()
}()
return serverHandleTLS(c, t)
}
for s.Scan() { for s.Scan() {
switch s.Text() { switch s.Text() {
case "EHLO localhost": case "EHLO localhost":
@ -1254,11 +1269,7 @@ func serverHandle(c net.Conn, t *testing.T) error {
return err return err
} }
config := &tls.Config{Certificates: []tls.Certificate{keypair}} config := &tls.Config{Certificates: []tls.Certificate{keypair}}
c = tls.Server(c, config) return tf(config)
defer func() {
_ = c.Close()
}()
return serverHandleTLS(c, t)
default: default:
t.Fatalf("unrecognized command: %q", s.Text()) t.Fatalf("unrecognized command: %q", s.Text())
} }