Skip to content

fix: potential race when reading incomingErr #125

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

Merged
merged 1 commit into from
Jan 8, 2025
Merged

fix: potential race when reading incomingErr #125

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
14 changes: 13 additions & 1 deletion websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ type wsConn struct {
// incoming messages
incoming chan io.Reader
incomingErr error
errLk sync.Mutex

readError chan error

Expand Down Expand Up @@ -115,12 +116,16 @@ func (c *wsConn) nextMessage() {
c.resetReadDeadline()
msgType, r, err := c.conn.NextReader()
if err != nil {
c.errLk.Lock()
c.incomingErr = err
c.errLk.Unlock()
close(c.incoming)
return
}
if msgType != websocket.BinaryMessage && msgType != websocket.TextMessage {
c.errLk.Lock()
c.incomingErr = errors.New("unsupported message type")
c.errLk.Unlock()
close(c.incoming)
return
}
Expand Down Expand Up @@ -647,7 +652,9 @@ func (c *wsConn) tryReconnect(ctx context.Context) bool {

c.writeLk.Lock()
c.conn = conn
c.errLk.Lock()
c.incomingErr = nil
c.errLk.Unlock()

c.stopPings = c.setupPings()

Expand Down Expand Up @@ -767,7 +774,9 @@ func (c *wsConn) handleWsConn(ctx context.Context) {
select {
case r, ok := <-c.incoming:
action = "incoming"
c.errLk.Lock()
err := c.incomingErr
c.errLk.Unlock()

if ok {
go c.readFrame(ctx, r)
Expand Down Expand Up @@ -798,7 +807,10 @@ func (c *wsConn) handleWsConn(ctx context.Context) {

c.writeLk.Lock()
if req.req.ID != nil { // non-notification
if c.incomingErr != nil { // No conn?, immediate fail
c.errLk.Lock()
hasErr := c.incomingErr != nil
c.errLk.Unlock()
if hasErr { // No conn?, immediate fail
req.ready <- clientResponse{
Jsonrpc: "2.0",
ID: req.req.ID,
Expand Down
Loading