les: fix dead lock (#20828)

multi-geth · Mar 27, 2020 · 62cd943 · 62cd943
1 parent d6c5f24
commit 62cd943
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/les/peer.go b/les/peer.go
@@ -531,8 +531,6 @@ func (p *serverPeer) getTxRelayCost(amount, size int) uint64 {
 // HasBlock checks if the peer has a given block
 func (p *serverPeer) HasBlock(hash common.Hash, number uint64, hasState bool) bool {
 	p.lock.RLock()
-	defer p.lock.RUnlock()
-
 	head := p.headInfo.Number
 	var since, recent uint64
 	if hasState {
@@ -543,6 +541,7 @@ func (p *serverPeer) HasBlock(hash common.Hash, number uint64, hasState bool) bo
 		recent = p.chainRecent
 	}
 	hasBlock := p.hasBlock
+	p.lock.RUnlock()
 
 	return head >= number && number >= since && (recent == 0 || number+recent+4 > head) && hasBlock != nil && hasBlock(hash, number, hasState)
 }