Merge branch 'ethereum:master' into portal

optimism-java · Jun 22, 2024 · 0f8632e · 0f8632e
2 parents 1189e67 + a71f6f9
commit 0f8632e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go
@@ -135,7 +135,7 @@ func waitForRevalidationPing(t *testing.T, transport *pingRecorder, tab *Table,
 		simclock.Run(tab.cfg.PingInterval * slowRevalidationFactor)
 		p := transport.waitPing(2 * time.Second)
 		if p == nil {
-			t.Fatal("Table did not send revalidation ping")
+			continue
 		}
 		if id == (enode.ID{}) || p.ID() == id {
 			return p

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