Move unlock to defer

kylecarbs · kylecarbs · commit 48078d2df0cd · 2022-01-27T14:49:25.000Z
diff --git a/peer/conn.go b/peer/conn.go
@@ -297,7 +297,9 @@ func (c *Conn) negotiate() {
 	c.pendingCandidatesMutex.Unlock()
 
 	if !c.offerrer {
+		// Lock new candidates from processing until we set the local description.
 		c.pendingCandidatesMutex.Lock()
+		defer c.pendingCandidatesMutex.Unlock()
 
 		answer, err := c.rtc.CreateAnswer(&webrtc.AnswerOptions{})
 		if err != nil {
@@ -320,7 +322,6 @@ func (c *Conn) negotiate() {
 
 		// Wait until the local description is set to flush candidates.
 		c.flushPendingCandidates()
-		c.pendingCandidatesMutex.Unlock()
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,9 @@ func (c *Conn) negotiate() {`
`297`	`297`	`c.pendingCandidatesMutex.Unlock()`
`298`	`298`
`299`	`299`	`if !c.offerrer {`
	`300`	`+ // Lock new candidates from processing until we set the local description.`
`300`	`301`	`c.pendingCandidatesMutex.Lock()`
	`302`	`+ defer c.pendingCandidatesMutex.Unlock()`
`301`	`303`
`302`	`304`	`answer, err := c.rtc.CreateAnswer(&webrtc.AnswerOptions{})`
`303`	`305`	`if err != nil {`
`@@ -320,7 +322,6 @@ func (c *Conn) negotiate() {`
`320`	`322`
`321`	`323`	`// Wait until the local description is set to flush candidates.`
`322`	`324`	`c.flushPendingCandidates()`
`323`		`- c.pendingCandidatesMutex.Unlock()`
`324`	`325`	`}`
`325`	`326`	`}`
`326`	`327`