Add mutex around SendWebsocket

mautrix · Jul 22, 2021 · c11b089 · c11b089
1 parent 74cd673
commit c11b089
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/appservice/appservice.go b/appservice/appservice.go
@@ -111,6 +111,7 @@ type AppService struct {
 	intentsLock sync.RWMutex
 
 	ws                    *websocket.Conn
+	wsWriteLock           sync.Mutex
 	StopWebsocket         func(error)
 	WebsocketCommands     chan WebsocketCommand
 	websocketRequests     map[int]chan<- *WebsocketCommand

diff --git a/appservice/websocket.go b/appservice/websocket.go
@@ -115,6 +115,8 @@ func (as *AppService) SendWebsocket(cmd *WebsocketRequest) error {
 	if as.ws == nil {
 		return errors.New("websocket not connected")
 	}
+	as.wsWriteLock.Lock()
+	defer as.wsWriteLock.Unlock()
 	return as.ws.WriteJSON(cmd)
 }