all: fix more resource leaks found by staticmajor

Updates #5706

Signed-off-by: Emmanuel T Odeke <emmanuel@orijtech.com>
This commit is contained in:
Emmanuel T Odeke
2022-09-27 00:37:27 +02:00
committed by Brad Fitzpatrick
parent 614a24763b
commit 680f8d9793
7 changed files with 45 additions and 3 deletions

View File

@@ -16,6 +16,7 @@ import (
"net/netip"
"os"
"strconv"
"sync"
"time"
"tailscale.com/types/logger"
@@ -323,6 +324,13 @@ func setupBatchTCPTest(logf logger.Logf, traf *TrafficGen) {
log.Fatalf("listen: %v", err)
}
var slCloseOnce sync.Once
slClose := func() {
slCloseOnce.Do(func() {
sl.Close()
})
}
s1, err := net.Dial("tcp", sl.Addr().String())
if err != nil {
log.Fatalf("dial: %v", err)
@@ -340,6 +348,8 @@ func setupBatchTCPTest(logf logger.Logf, traf *TrafficGen) {
go func() {
// transmitter
defer slClose()
defer s1.Close()
bs1 := bufio.NewWriterSize(s1, 1024*1024)
@@ -375,6 +385,8 @@ func setupBatchTCPTest(logf logger.Logf, traf *TrafficGen) {
go func() {
// receiver
defer slClose()
defer s2.Close()
bs2 := bufio.NewReaderSize(s2, 1024*1024)