roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

core: initialize current block/fastblock atomics to nil, fix #19286 (#19352)

Browse Source
This commit is contained in:
Martin Holst Swende 2019-09-26 11:10:35 +02:00 committed by GitHub
parent 2133f18f15
commit ead711779d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/blockchain.go
View File

@ -228,10 +228,16 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
if bc.genesisBlock == nil { if bc.genesisBlock == nil {
return nil, ErrNoGenesis return nil, ErrNoGenesis
} }
var nilBlock *types.Block
bc.currentBlock.Store(nilBlock)
bc.currentFastBlock.Store(nilBlock)
// Initialize the chain with ancient data if it isn't empty. // Initialize the chain with ancient data if it isn't empty.
if bc.empty() { if bc.empty() {
rawdb.InitDatabaseFromFreezer(bc.db) rawdb.InitDatabaseFromFreezer(bc.db)
} }
if err := bc.loadLastState(); err != nil { if err := bc.loadLastState(); err != nil {
return nil, err return nil, err
} }