check nil transactions (#1537)

baptiste-b-pegasys · web-flow · commit 703f2a049ea6 · 2022-10-31T11:59:46.000Z
diff --git a/core/types/transaction.go b/core/types/transaction.go
@@ -647,6 +647,9 @@ func (m Message) WithEmptyPrivateData(b bool) Message {
 }
 
 func (tx *Transaction) IsPrivate() bool {
+	if tx == nil {
+		return false
+	}
 	v, _, _ := tx.RawSignatureValues()
 	if v == nil {
 		return false
@@ -675,7 +678,7 @@ func (tx *Transaction) SetPrivate() {
 }
 
 func (tx *Transaction) IsPrivacyMarker() bool {
-	return tx.To() != nil && *tx.To() == common.QuorumPrivacyPrecompileContractAddress()
+	return tx != nil && tx.To() != nil && *tx.To() == common.QuorumPrivacyPrecompileContractAddress()
 }
 
 // PrivacyMetadata encapsulates privacy information to be attached

Original file line number	Diff line number	Diff line change
`@@ -647,6 +647,9 @@ func (m Message) WithEmptyPrivateData(b bool) Message {`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`func (tx *Transaction) IsPrivate() bool {`
	`650`	`+ if tx == nil {`
	`651`	`+ return false`
	`652`	`+ }`
`650`	`653`	`v, _, _ := tx.RawSignatureValues()`
`651`	`654`	`if v == nil {`
`652`	`655`	`return false`
`@@ -675,7 +678,7 @@ func (tx *Transaction) SetPrivate() {`
`675`	`678`	`}`
`676`	`679`
`677`	`680`	`func (tx *Transaction) IsPrivacyMarker() bool {`
`678`		`- return tx.To() != nil && *tx.To() == common.QuorumPrivacyPrecompileContractAddress()`
	`681`	`+ return tx != nil && tx.To() != nil && *tx.To() == common.QuorumPrivacyPrecompileContractAddress()`
`679`	`682`	`}`
`680`	`683`
`681`	`684`	`// PrivacyMetadata encapsulates privacy information to be attached`