diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-07-18 21:03:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 21:03:36 +0800 |
| commit | 8485f7cc7b1cb2f062e0bc50006f5a6841a8878f (patch) | |
| tree | dbe903be29cebcc63274d53f01e3286eb27bca15 | |
| parent | f088c650a58c1eff8b2b6fe51d7e4b8e9762200f (diff) | |
| parent | 61a20cb56d5c135bc5525aa0089671da26572a78 (diff) | |
| download | go-tangerine-8485f7cc7b1cb2f062e0bc50006f5a6841a8878f.tar go-tangerine-8485f7cc7b1cb2f062e0bc50006f5a6841a8878f.tar.gz go-tangerine-8485f7cc7b1cb2f062e0bc50006f5a6841a8878f.tar.bz2 go-tangerine-8485f7cc7b1cb2f062e0bc50006f5a6841a8878f.tar.lz go-tangerine-8485f7cc7b1cb2f062e0bc50006f5a6841a8878f.tar.xz go-tangerine-8485f7cc7b1cb2f062e0bc50006f5a6841a8878f.tar.zst go-tangerine-8485f7cc7b1cb2f062e0bc50006f5a6841a8878f.zip | |
Merge pull request #19854 from karalabe/genesis-commit-check
core: check error before accessing potentially nil block
| -rw-r--r-- | core/genesis.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/genesis.go b/core/genesis.go index 57809fe73..87bab2520 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -164,7 +164,10 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig log.Info("Writing custom genesis block") } block, err := genesis.Commit(db) - return genesis.Config, block.Hash(), err + if err != nil { + return genesis.Config, common.Hash{}, err + } + return genesis.Config, block.Hash(), nil } // We have the genesis block in database(perhaps in ancient database) @@ -180,7 +183,10 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig return genesis.Config, hash, &GenesisMismatchError{stored, hash} } block, err := genesis.Commit(db) - return genesis.Config, block.Hash(), err + if err != nil { + return genesis.Config, hash, err + } + return genesis.Config, block.Hash(), nil } // Check whether the genesis block is already written. |