Skip to content

Commit 12a2e39

Browse files
author
Baptiste Boussemart
committed
fix: null pointer
1 parent ae50ace commit 12a2e39

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

core/blockchain.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2817,7 +2817,12 @@ func (bc *BlockChain) GetTransactionLookup(hash common.Hash) *rawdb.LegacyTxLook
28172817
func (bc *BlockChain) Config() *params.ChainConfig { return bc.chainConfig }
28182818

28192819
// QuorumConfig retrieves the Quorum chain's configuration
2820-
func (bc *BlockChain) QuorumConfig() *QuorumChainConfig { return bc.quorumConfig }
2820+
func (bc *BlockChain) QuorumConfig() *QuorumChainConfig {
2821+
if bc == nil || bc.quorumConfig == nil {
2822+
return &QuorumChainConfig{}
2823+
}
2824+
return bc.quorumConfig
2825+
}
28212826

28222827
// Engine retrieves the blockchain's consensus engine.
28232828
func (bc *BlockChain) Engine() consensus.Engine { return bc.engine }

core/vm/runtime/runtime_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ func (d *dummyChain) SupportsMultitenancy(context.Context) (*proto.PreAuthentica
255255
}
256256

257257
// Config retrieves the chain's fork configuration
258-
func (d *dummyChain) Config() *params.ChainConfig { return nil }
258+
func (d *dummyChain) Config() *params.ChainConfig { return &params.ChainConfig{} }
259259

260260
// QuorumConfig retrieves the Quorum chain's configuration
261-
func (d *dummyChain) QuorumConfig() *core.QuorumChainConfig { return nil }
261+
func (d *dummyChain) QuorumConfig() *core.QuorumChainConfig { return &core.QuorumChainConfig{} }
262262

263263
// PrivateStateManager returns the private state manager
264264
func (d *dummyChain) PrivateStateManager() mps.PrivateStateManager { return nil }

light/lightchain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ func (lc *LightChain) SupportsMultitenancy(context.Context) (*proto.PreAuthentic
603603
}
604604

605605
// QuorumConfig retrieves the Quorum chain's configuration
606-
func (lc *LightChain) QuorumConfig() *core.QuorumChainConfig { return nil }
606+
func (lc *LightChain) QuorumConfig() *core.QuorumChainConfig { return &core.QuorumChainConfig{} }
607607

608608
// PrivateStateManager returns the private state manager
609609
func (lc *LightChain) PrivateStateManager() mps.PrivateStateManager { return nil }

0 commit comments

Comments
 (0)