Merge pull request #2151 from slingamn/modes_forwardport

fix deadlock on channel state mutex
2024-05-06 08:47:23 +02:00 · 2024-05-06 02:32:40 -04:00
1 changed files with 5 additions and 3 deletions
--- 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) {
Author	SHA1	Message	Date
Shivaram Lingamneni	ca4b9c15c5	Merge pull request #2151 from slingamn/modes_forwardport fix deadlock on channel state mutex	2024-05-06 08:47:23 +02:00
Shivaram Lingamneni	6abb291290	fix deadlock on channel state mutex	2024-05-06 02:32:40 -04:00