mirror of
https://github.com/nspcc-dev/neo-go.git
synced 2024-11-21 11:51:03 +00:00
rpcclient/WS: do not deadlock on connection loss
`makeWsRequest` creates a channel for response and waits for it. If between creating the channel and starting the reading `select` connection is lost (`writerDone` channel is closed), nothing reads from the channel and a deadlock appears. Looking at "done" channels when transferring RPC data solves the issue. Closes #3530. Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
parent
8d4e8b6047
commit
9fadfef0d7
1 changed files with 7 additions and 1 deletions
|
@ -601,7 +601,13 @@ readloop:
|
|||
connCloseErr = fmt.Errorf("unknown response channel for response %d", id)
|
||||
break readloop // Unknown response (unexpected response ID).
|
||||
}
|
||||
ch <- &rr.Response
|
||||
select {
|
||||
case <-c.writerDone:
|
||||
break readloop
|
||||
case <-c.shutdown:
|
||||
break readloop
|
||||
case ch <- &rr.Response:
|
||||
}
|
||||
} else {
|
||||
// Malformed response, neither valid request, nor valid response.
|
||||
connCloseErr = fmt.Errorf("malformed response")
|
||||
|
|
Loading…
Reference in a new issue