status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19562 from holiman/fix_tabcrash 

p2p/discover: fix nil-dereference due to race
This commit is contained in:
Péter Szilágyi 2019-05-13 13:31:45 +03:00 committed by GitHub
parent ec2131c8d3 95263914fc
commit a0b81097ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
p2p/discover/table.go
View File

@ -119,7 +119,6 @@ func newTable(t transport, db *enode.DB, bootnodes []*enode.Node, log log.Logger
tab.seedRand() tab.seedRand()
tab.loadSeedNodes() tab.loadSeedNodes()
go tab.loop()
return tab, nil return tab, nil
} }

1
p2p/discover/table_util_test.go
View File

@ -42,6 +42,7 @@ func init() {
func newTestTable(t transport) (*Table, *enode.DB) { func newTestTable(t transport) (*Table, *enode.DB) {
db, _ := enode.OpenDB("") db, _ := enode.OpenDB("")
tab, _ := newTable(t, db, nil, log.Root()) tab, _ := newTable(t, db, nil, log.Root())
go tab.loop()
return tab, db return tab, db
} }

1
p2p/discover/v4_udp.go
View File

@ -253,6 +253,7 @@ func ListenV4(c UDPConn, ln *enode.LocalNode, cfg Config) (*UDPv4, error) {
return nil, err return nil, err
} }
t.tab = tab t.tab = tab
go tab.loop()
t.wg.Add(2) t.wg.Add(2)
go t.loop() go t.loop()