forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-17 12:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/discover: fix timeout loop early exit when removing expired matchers

Browse source 
Save `el.Next()` before calling `plist.Remove(el)` so iteration continues correctly. Previously the loop exited after removing the first expired matcher because `Remove` invalidates the element's links.
This commit is contained in:
Tanvir 2026-04-17 03:23:22 +08:00
parent fc43170cdd
commit a37824d1f8
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
p2p/discover/v4_udp.go
View file

@ -499,13 +499,15 @@ func (t *UDPv4) loop() {
nextTimeout = nil nextTimeout = nil
// Notify and remove callbacks whose deadline is in the past. // Notify and remove callbacks whose deadline is in the past.
for el := plist.Front(); el != nil; el = el.Next() { for el := plist.Front(); el != nil; {
next := el.Next()
p := el.Value.(*replyMatcher) p := el.Value.(*replyMatcher)
if now.After(p.deadline) || now.Equal(p.deadline) { if now.After(p.deadline) || now.Equal(p.deadline) {
p.errc <- errTimeout p.errc <- errTimeout
plist.Remove(el) plist.Remove(el)
contTimeouts++ contTimeouts++
} }
el = next
} }
// If we've accumulated too many timeouts, do an NTP time sync check // If we've accumulated too many timeouts, do an NTP time sync check
if contTimeouts > ntpFailureThreshold { if contTimeouts > ntpFailureThreshold {