conn: close timeout chan before relesing stream to prevent race

luis-sousa-pinto · May 21, 2018 · 95711e6 · 95711e6
1 parent e4f695e
commit 95711e6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/conn.go b/conn.go
@@ -711,13 +711,13 @@ func (c *Conn) sendFrame(ctx context.Context, call *callReq, timeoutCh <-chan ti
 	case c.frameWriteArgChan <- call:
 		return nil
 	case <-timeoutCh:
-		c.releaseStream(call.streamID)
 		close(call.timeout)
+		c.releaseStream(call.streamID)
 		c.handleTimeout()
 		return ErrTimeoutNoResponse
 	case <-ctxDone:
-		c.releaseStream(call.streamID)
 		close(call.timeout)
+		c.releaseStream(call.streamID)
 		return ctx.Err()
 	case <-c.quit:
 		return ErrConnectionClosed