Fix race condition null pointer crash in bridge.go:313

diodechain · Dec 3, 2024 · 6b550d3 · 6b550d3
1 parent 04b4643
commit 6b550d3
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/rpc/bridge.go b/rpc/bridge.go
@@ -310,11 +310,17 @@ func (client *Client) recvMessageLoop() {
 	}()
 
 	for {
+		if client.s == nil {
+			if !client.isClosed {
+				client.Log().Info("Client connection closed prematurely.")
+				client.Close()
+			}
+			return
+		}
 		msg, err := client.s.readMessage()
 		if err != nil {
 			if !client.isClosed {
-				// This was unexpected...
-				client.Log().Info("Client connection closed: %v", err)
+				client.Log().Info("Client connection closed unexpectedly: %v", err)
 				client.Close()
 			}
 			return