fix: connection.BlockFetch().Client.GetBlock potential deadlock (#787)

Newt6611 · web-flow · commit 9a80cbd47748 · 2024-11-11T15:36:42.000-05:00
diff --git a/protocol/blockfetch/client.go b/protocol/blockfetch/client.go
@@ -164,6 +164,7 @@ func (c *Client) GetBlock(point common.Point) (ledger.Block, error) {
 	}
 	err, ok := <-c.startBatchResultChan
 	if !ok {
+		c.busyMutex.Unlock()
 		return nil, protocol.ProtocolShuttingDownError
 	}
 	if err != nil {
@@ -172,6 +173,7 @@ func (c *Client) GetBlock(point common.Point) (ledger.Block, error) {
 	}
 	block, ok := <-c.blockChan
 	if !ok {
+		c.busyMutex.Unlock()
 		return nil, protocol.ProtocolShuttingDownError
 	}
 	return block, nil

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ func (c *Client) GetBlock(point common.Point) (ledger.Block, error) {`
`164`	`164`	`}`
`165`	`165`	`err, ok := <-c.startBatchResultChan`
`166`	`166`	`if !ok {`
	`167`	`+ c.busyMutex.Unlock()`
`167`	`168`	`return nil, protocol.ProtocolShuttingDownError`
`168`	`169`	`}`
`169`	`170`	`if err != nil {`
`@@ -172,6 +173,7 @@ func (c *Client) GetBlock(point common.Point) (ledger.Block, error) {`
`172`	`173`	`}`
`173`	`174`	`block, ok := <-c.blockChan`
`174`	`175`	`if !ok {`
	`176`	`+ c.busyMutex.Unlock()`
`175`	`177`	`return nil, protocol.ProtocolShuttingDownError`
`176`	`178`	`}`
`177`	`179`	`return block, nil`