internal/ethapi: fix eth_call crash

XinFinOrg · Jul 22, 2024 · 2b21070 · 2b21070
1 parent 83f4c89
commit 2b21070
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1305,6 +1305,9 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
 	if statedb == nil || err != nil {
 		return nil, 0, false, err, nil
 	}
+	if header == nil {
+		return nil, 0, false, errors.New("nil header in DoCall"), nil
+	}
 	if err := overrides.Apply(statedb); err != nil {
 		return nil, 0, false, err, nil
 	}
@@ -1327,6 +1330,9 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
 	if err != nil {
 		return nil, 0, false, err, nil
 	}
+	if block == nil {
+		return nil, 0, false, fmt.Errorf("nil block in DoCall: number=%d, hash=%s", header.Number.Uint64(), header.Hash().Hex()), nil
+	}
 	author, err := b.GetEngine().Author(block.Header())
 	if err != nil {
 		return nil, 0, false, err, nil