adds a lock on writeClose. closes coder#448

FrauElster · Sep 5, 2024 · 0daf07f · 0daf07f
1 parent 3dd723a
commit 0daf07f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/close.go b/close.go
@@ -169,6 +169,12 @@ func (c *Conn) closeHandshake(code StatusCode, reason string) error {
 }
 
 func (c *Conn) writeClose(code StatusCode, reason string) error {
+	c.closeMu.Lock()
+	defer c.closeMu.Unlock()
+	if c.closeWritten {
+		return nil
+	}
+
 	ce := CloseError{
 		Code:   code,
 		Reason: reason,
@@ -193,6 +199,7 @@ func (c *Conn) writeClose(code StatusCode, reason string) error {
 	if err != nil && !errors.Is(err, net.ErrClosed) {
 		return err
 	}
+	c.closeWritten = true
 	return nil
 }
 

diff --git a/conn.go b/conn.go
@@ -73,9 +73,10 @@ type Conn struct {
 	closeReadCtx  context.Context
 	closeReadDone chan struct{}
 
-	closed  chan struct{}
-	closeMu sync.Mutex
-	closing bool
+	closed       chan struct{}
+	closeMu      sync.Mutex
+	closing      bool
+	closeWritten bool
 
 	pingCounter   atomic.Int64
 	activePingsMu sync.Mutex