Fix deadlock in connctx.WriteContext

Fixes pion/dtls#390
pion · Dec 16, 2021 · 538d788 · 538d788
1 parent 78491f1
commit 538d788
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -6,6 +6,7 @@
 Atsushi Watanabe <atsushi.w@ieee.org>
 backkem <mail@backkem.me>
 Hugo Arregui <hugo.arregui@gmail.com>
+Jozef Kralik <jojo.lwin@gmail.com>
 Juliusz Chroboczek <jch@irif.fr>
 Luke Curley <kixelated@gmail.com>
 Mathis Engelbart <mathis.engelbart@gmail.com>

diff --git a/connctx/connctx.go b/connctx/connctx.go
@@ -118,6 +118,7 @@ func (c *connCtx) WriteContext(ctx context.Context, b []byte) (int, error) {
 	var errSetDeadline atomic.Value
 	wg.Add(1)
 	go func() {
+		defer wg.Done()
 		select {
 		case <-ctx.Done():
 			// context canceled
@@ -131,7 +132,6 @@ func (c *connCtx) WriteContext(ctx context.Context, b []byte) (int, error) {
 			}
 		case <-done:
 		}
-		wg.Done()
 	}()
 
 	n, err := c.nextConn.Write(b)