From 9d44a476c63779ffc8ce3bc84db69f34f8cec98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= Date: Mon, 3 Jun 2024 20:14:39 +0200 Subject: [PATCH] Fix double unlock in client.go --- relay/client/client.go | 4 +--- relay/messages/message.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/relay/client/client.go b/relay/client/client.go index 2d660f1db..e59110005 100644 --- a/relay/client/client.go +++ b/relay/client/client.go @@ -79,16 +79,14 @@ func (c *Client) Connect() error { defer c.readLoopMutex.Unlock() c.mu.Lock() + defer c.mu.Unlock() if c.serviceIsRunning { - c.mu.Unlock() return nil } - c.mu.Unlock() err := c.connect() if err != nil { - c.mu.Unlock() return err } diff --git a/relay/messages/message.go b/relay/messages/message.go index c71d203b1..d3a96af69 100644 --- a/relay/messages/message.go +++ b/relay/messages/message.go @@ -38,7 +38,7 @@ func DetermineClientMsgType(msg []byte) (MsgType, error) { case MsgTypeTransport: return msgType, nil default: - return 0, fmt.Errorf("invalid msg type: %s", msg) + return 0, fmt.Errorf("invalid msg type, len: %d", len(msg)) } }