fix: Protect circular buffer during close in reconnectingPTY (#3646)

mafredri · web-flow · commit 5025fe2fa068 · 2022-08-23T16:07:31.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -801,7 +801,9 @@ func (r *reconnectingPTY) Close() {
 		_ = conn.Close()
 	}
 	_ = r.ptty.Close()
+	r.circularBufferMutex.Lock()
 	r.circularBuffer.Reset()
+	r.circularBufferMutex.Unlock()
 	r.timeout.Stop()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,9 @@ func (r *reconnectingPTY) Close() {`
`801`	`801`	`_ = conn.Close()`
`802`	`802`	`}`
`803`	`803`	`_ = r.ptty.Close()`
	`804`	`+ r.circularBufferMutex.Lock()`
`804`	`805`	`r.circularBuffer.Reset()`
	`806`	`+ r.circularBufferMutex.Unlock()`
`805`	`807`	`r.timeout.Stop()`
`806`	`808`	`}`
`807`	`809`