Merge pull request #1229 from jbhurat/ibft_check_core

nmvalera · web-flow · commit ec5153f2f9ab · 2021-07-22T17:25:33.000+02:00
istanbul: Check if sb.core is nil before processing NewBlockMsg
diff --git a/consensus/istanbul/backend/handler.go b/consensus/istanbul/backend/handler.go
@@ -103,7 +103,7 @@ func (sb *Backend) HandleMsg(addr common.Address, msg p2p.Msg) (bool, error) {
 	}
 	//https://github.com/ConsenSys/quorum/pull/539
 	//https://github.com/ConsenSys/quorum/issues/389
-	if msg.Code == NewBlockMsg && sb.core.IsProposer() { // eth.NewBlockMsg: import cycle
+	if msg.Code == NewBlockMsg && sb.core != nil && sb.core.IsProposer() { // eth.NewBlockMsg: import cycle
 		// this case is to safeguard the race of similar block which gets propagated from other node while this node is proposing
 		// as p2p.Msg can only be decoded once (get EOF for any subsequence read), we need to make sure the payload is restored after we decode it
 		sb.logger.Debug("BFT: received NewBlockMsg", "size", msg.Size, "payload.type", reflect.TypeOf(msg.Payload), "sender", addr)

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (sb *Backend) HandleMsg(addr common.Address, msg p2p.Msg) (bool, error) {`
`103`	`103`	`}`
`104`	`104`	`//https://github.com/ConsenSys/quorum/pull/539`
`105`	`105`	`//https://github.com/ConsenSys/quorum/issues/389`
`106`		`- if msg.Code == NewBlockMsg && sb.core.IsProposer() { // eth.NewBlockMsg: import cycle`
	`106`	`+ if msg.Code == NewBlockMsg && sb.core != nil && sb.core.IsProposer() { // eth.NewBlockMsg: import cycle`
`107`	`107`	`// this case is to safeguard the race of similar block which gets propagated from other node while this node is proposing`
`108`	`108`	`// as p2p.Msg can only be decoded once (get EOF for any subsequence read), we need to make sure the payload is restored after we decode it`
`109`	`109`	`sb.logger.Debug("BFT: received NewBlockMsg", "size", msg.Size, "payload.type", reflect.TypeOf(msg.Payload), "sender", addr)`