forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-15 00:13:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ethereum:master' into portal

Browse source
This commit is contained in:
Chen Kai 2024-06-22 11:39:03 +08:00 committed by GitHub
commit 0f8632ed9b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
p2p/discover/table_test.go
View file

@ -135,7 +135,7 @@ func waitForRevalidationPing(t *testing.T, transport *pingRecorder, tab *Table,
simclock.Run(tab.cfg.PingInterval * slowRevalidationFactor) simclock.Run(tab.cfg.PingInterval * slowRevalidationFactor)
p := transport.waitPing(2 * time.Second) p := transport.waitPing(2 * time.Second)
if p == nil { if p == nil {
t.Fatal("Table did not send revalidation ping") continue
} }
if id == (enode.ID{}) || p.ID() == id { if id == (enode.ID{}) || p.ID() == id {
return p return p

5
p2p/rlpx/rlpx.go
View file

@ -604,6 +604,11 @@ func (h *handshakeState) readMsg(msg interface{}, prv *ecdsa.PrivateKey, r io.Re
} }
size := binary.BigEndian.Uint16(prefix) size := binary.BigEndian.Uint16(prefix)
// baseProtocolMaxMsgSize = 2 * 1024
if size > 2048 {
return nil, errors.New("message too big")
}
// Read the handshake packet. // Read the handshake packet.
packet, err := h.rbuf.read(r, int(size)) packet, err := h.rbuf.read(r, int(size))
if err != nil { if err != nil {