forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/catalyst: avoid nil deref

Browse source
This commit is contained in:
Martin Holst Swende 2024-03-14 10:01:05 +01:00
parent a47297125c
commit ecbbdf2cd4
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
eth/catalyst/api.go
View file

@ -37,6 +37,7 @@ import (
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/params/forks" "github.com/ethereum/go-ethereum/params/forks"
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
"strconv"
) )
// Register adds the engine API to the full node. // Register adds the engine API to the full node.
@ -540,6 +541,14 @@ func (api *ConsensusAPI) newPayload(params engine.ExecutableData, versionedHashe
log.Trace("Engine API request received", "method", "NewPayload", "number", params.Number, "hash", params.BlockHash) log.Trace("Engine API request received", "method", "NewPayload", "number", params.Number, "hash", params.BlockHash)
block, err := engine.ExecutableDataToBlock(params, versionedHashes, beaconRoot) block, err := engine.ExecutableDataToBlock(params, versionedHashes, beaconRoot)
if err != nil { if err != nil {
bgu := "nil"
if params.BlobGasUsed != nil {
bgu = strconv.Itoa(int(*params.BlobGasUsed))
}
ebg := "nil"
if params.BlobGasUsed != nil {
ebg = strconv.Itoa(int(*params.ExcessBlobGas))
}
log.Warn("Invalid NewPayload params", log.Warn("Invalid NewPayload params",
"params.Number", params.Number, "params.Number", params.Number,
"params.ParentHash", params.ParentHash, "params.ParentHash", params.ParentHash,
@ -553,8 +562,8 @@ func (api *ConsensusAPI) newPayload(params engine.ExecutableData, versionedHashe
"params.Timestamp", params.Timestamp, "params.Timestamp", params.Timestamp,
"params.ExtraData", common.PrettyBytes(params.ExtraData), "params.ExtraData", common.PrettyBytes(params.ExtraData),
"params.BaseFeePerGas", params.BaseFeePerGas, "params.BaseFeePerGas", params.BaseFeePerGas,
"params.BlobGasUsed", *params.BlobGasUsed, "params.BlobGasUsed", bgu,
"params.ExcessBlobGas", *params.ExcessBlobGas, "params.ExcessBlobGas", ebg,
"len(params.Transactions)", len(params.Transactions), "len(params.Transactions)", len(params.Transactions),
"len(params.Withdrawals)", len(params.Withdrawals), "len(params.Withdrawals)", len(params.Withdrawals),
"beaconRoot", beaconRoot, "beaconRoot", beaconRoot,