write.go: Fix deadlock in writeFrame (#253)

nhooyr · web-flow · commit 897a573291be · 2020-07-05T17:02:20.000-04:00
Closes #248 Luckily, due to the 5s timeout on the close handshake, this would have had very minimal effects on anyone in production.
diff --git a/write.go b/write.go
@@ -257,7 +257,6 @@ func (c *Conn) writeFrame(ctx context.Context, fin bool, flate bool, opcode opco
 	if err != nil {
 		return 0, err
 	}
-	defer c.writeFrameMu.unlock()
 
 	// If the state says a close has already been written, we wait until
 	// the connection is closed and return that error.
@@ -268,13 +267,15 @@ func (c *Conn) writeFrame(ctx context.Context, fin bool, flate bool, opcode opco
 	wroteClose := c.wroteClose
 	c.closeMu.Unlock()
 	if wroteClose && opcode != opClose {
+		c.writeFrameMu.unlock()
 		select {
 		case <-ctx.Done():
 			return 0, ctx.Err()
 		case <-c.closed:
 			return 0, c.closeErr
 		}
 	}
+	defer c.writeFrameMu.unlock()
 
 	select {
 	case <-c.closed:
