Skip to content

Fix self-deadlock in handleRoleSelection #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shwetd19 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix self-deadlock in handleRoleSelection #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions backend/websocket/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,15 +664,17 @@ func handleTopicChange(room *Room, conn *websocket.Conn, message Message, roomID

// handleRoleSelection handles role selection
func handleRoleSelection(room *Room, conn *websocket.Conn, message Message, roomID string) {
// Store the role in the client
// Store the role in the client, releasing the lock before broadcasting
// since snapshotRecipients and broadcastParticipants lock room.Mutex themselves
room.Mutex.Lock()
defer room.Mutex.Unlock()
if client, exists := room.Clients[conn]; exists {
if client.IsSpectator {
room.Mutex.Unlock()
return
}
client.Role = message.Role
}
room.Mutex.Unlock()

// Broadcast role selection to other clients
for _, r := range snapshotRecipients(room, conn) {
Expand Down