From d652a58ada207fa9a372f2fa594d5a151ed44a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 9 Jun 2015 21:13:21 +0300 Subject: [PATCH] core: fix a race condition accessing the gas limit --- core/chain_manager.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/chain_manager.go b/core/chain_manager.go index 82fdbb1f1..6897c453c 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -179,7 +179,9 @@ func (self *ChainManager) Td() *big.Int { } func (self *ChainManager) GasLimit() *big.Int { - // return self.currentGasLimit + self.mu.RLock() + defer self.mu.RUnlock() + return self.currentBlock.GasLimit() } @@ -376,8 +378,8 @@ func (self *ChainManager) ExportN(w io.Writer, first uint64, last uint64) error return nil } -// insert appends injects a block into the current chain block chain. Note, this -// function assumes that the `mu` mutex is held! +// insert injects a block into the current chain block chain. Note, this function +// assumes that the `mu` mutex is held! func (bc *ChainManager) insert(block *types.Block) { key := append(blockNumPre, block.Number().Bytes()...) bc.blockDb.Put(key, block.Hash().Bytes())