fix: nil pointer on clear of disconnected controller

deco-finter · Oct 27, 2021 · 4faf228 · 4faf228
1 parent 1fde5ab
commit 4faf228
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/fableous-be/handlers/websocket.go b/fableous-be/handlers/websocket.go
@@ -230,7 +230,9 @@ func (m *module) HubCommandWorker(conn *websocket.Conn, sess *activeSession) (er
 			// check if CONTROL message clears a controller's canvas
 			if clearedController := message.Data.(*pb.WSMessage_Control).Control.Clear; clearedController != pb.ControllerRole_NONE {
 				_ = utils.SendMessage(sess.hubConn, message)
-				_ = utils.SendMessage(sess.controllerConn[clearedController], message)
+				if targetConn, ok := sess.controllerConn[clearedController]; ok {
+					_ = utils.SendMessage(targetConn, message)
+				}
 			}
 			// check if CONTROL message kicks a controller
 			if kickedController := message.Data.(*pb.WSMessage_Control).Control.Kick; kickedController != pb.ControllerRole_NONE {

diff --git a/fableous-be/utils/websocket.go b/fableous-be/utils/websocket.go
@@ -15,6 +15,9 @@ var sendMutex sync.Mutex
 
 // SendMessage sends a message to the WebSocket client.
 func SendMessage(conn *websocket.Conn, message *pb.WSMessage) (err error) {
+	if conn == nil {
+		return
+	}
 	var bytes []byte
 	if bytes, err = proto.Marshal(message); err != nil {
 		return