Skip to content

eth: unsubscribe from subscriptions on error to prevent leaks #32878

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+4 −0
Open

eth: unsubscribe from subscriptions on error to prevent leaks #32878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0569ce
Fix eth/filters: Unsubscription Missing at `filter` Api With Subscrip…
CertiK-Geth Sep 30, 2025
624503c
Merge branch 'ethereum:master' into master
CertiK-Geth Oct 11, 2025
fa92c65
eth: unsubscribe from subscriptions on error to prevent leaks
CertiK-Geth Oct 11, 2025
5ffb604
Merge branch 'ethereum:master' into master
CertiK-Geth Oct 17, 2025
0c125a8
fix: use maximum uint64 value for receipt chain insertion
CertiK-Geth Oct 17, 2025
ac23136
Revert "fix: use maximum uint64 value for receipt chain insertion"
johnzhu0907 Oct 17, 2025
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
3 changes: 3 additions & 0 deletions eth/filters/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ func (api *FilterAPI) timeoutLoop(timeout time.Duration) {
select {
case <-ticker.C:
case <-api.events.chainSub.Err():
api.events.chainSub.Unsubscribe()
return
}
api.filtersMu.Lock()
Expand Down Expand Up @@ -231,6 +232,7 @@ func (api *FilterAPI) NewBlockFilter() rpc.ID {
api.filtersMu.Lock()
delete(api.filters, headerSub.ID)
api.filtersMu.Unlock()
headerSub.Unsubscribe()
return
}
}
Expand Down Expand Up @@ -417,6 +419,7 @@ func (api *FilterAPI) NewFilter(crit FilterCriteria) (rpc.ID, error) {
api.filtersMu.Lock()
delete(api.filters, logsSub.ID)
api.filtersMu.Unlock()
logsSub.Unsubscribe()
return
}
}
Expand Down
1 change: 1 addition & 0 deletions eth/gasprice/gasprice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ func NewOracle(backend OracleBackend, params Config, startPrice *big.Int) *Oracl
sub := backend.SubscribeChainHeadEvent(headEvent)
if sub != nil { // the gasprice testBackend doesn't support subscribing to head events
go func() {
defer sub.Unsubscribe()
var lastHead common.Hash
for {
select {
Expand Down