internal/ethapi: check nil header and block

XinFinOrg · Jul 22, 2024 · 638e258 · 638e258
1 parent 44c31e7
commit 638e258
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1958,6 +1958,9 @@ func AccessList(ctx context.Context, b Backend, blockNrOrHash rpc.BlockNumberOrH
 	if err != nil {
 		return nil, 0, nil, err
 	}
+	if block == nil {
+		return nil, 0, nil, fmt.Errorf("nil block in AccessList: number=%d, hash=%s", header.Number.Uint64(), header.Hash().Hex())
+	}
 	author, err := b.GetEngine().Author(block.Header())
 	if err != nil {
 		return nil, 0, nil, err
@@ -3627,10 +3630,16 @@ func GetSignersFromBlocks(b Backend, blockNumber uint64, blockHash common.Hash,
 			if err != nil {
 				return addrs, err
 			}
+			if header == nil {
+				return addrs, errors.New("nil header in GetSignersFromBlocks")
+			}
 			blockData, err := b.BlockByNumber(nil, rpc.BlockNumber(i))
 			if err != nil {
 				return addrs, err
 			}
+			if blockData == nil {
+				return addrs, errors.New("nil blockData in GetSignersFromBlocks")
+			}
 			signTxs := engine.CacheSigningTxs(header.Hash(), blockData.Transactions())
 			for _, signtx := range signTxs {
 				blkHash := common.BytesToHash(signtx.Data()[len(signtx.Data())-32:])