Merge pull request #2151 from slingamn/modes_forwardport

fix deadlock on channel state mutex
ergochat · May 6, 2024 · ca4b9c1 · ca4b9c1
2 parents ccc362b + 6abb291
commit ca4b9c1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/irc/getters.go b/irc/getters.go
@@ -612,9 +612,11 @@ func (channel *Channel) Founder() string {
 
 func (channel *Channel) HighestUserMode(client *Client) (result modes.Mode) {
 	channel.stateMutex.RLock()
-	clientModes := channel.members[client].modes
-	channel.stateMutex.RUnlock()
-	return clientModes.HighestChannelUserMode()
+	defer channel.stateMutex.RUnlock()
+	if clientData, ok := channel.members[client]; ok {
+		return clientData.modes.HighestChannelUserMode()
+	}
+	return
 }
 
 func (channel *Channel) Settings() (result ChannelSettings) {