Commit897a573

authored

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

Closes#248Luckily, due to the 5s timeout on the close handshake, this would havehad very minimal effects on anyone in production.

1 parent493ebbe commit897a573Copy full SHA for 897a573

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,6 @@ func (c *Conn) writeFrame(ctx context.Context, fin bool, flate bool, opcode opco`
`257`	`257`	`iferr!=nil {`
`258`	`258`	`return0,err`
`259`	`259`	`}`
`260`		`-deferc.writeFrameMu.unlock()`
`261`	`260`
`262`	`261`	`// If the state says a close has already been written, we wait until`
`263`	`262`	`// 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`
`268`	`267`	`wroteClose:=c.wroteClose`
`269`	`268`	`c.closeMu.Unlock()`
`270`	`269`	`ifwroteClose&&opcode!=opClose {`
	`270`	`+c.writeFrameMu.unlock()`
`271`	`271`	`select {`
`272`	`272`	`case<-ctx.Done():`
`273`	`273`	`return0,ctx.Err()`
`274`	`274`	`case<-c.closed:`
`275`	`275`	`return0,c.closeErr`
`276`	`276`	`}`
`277`	`277`	`}`
	`278`	`+deferc.writeFrameMu.unlock()`
`278`	`279`
`279`	`280`	`select {`
`280`	`281`	`case<-c.closed:`

Comments

(0)