Merge pull request #33 from ava-labs/fix-nil-pointer

Fix potential nil pointer dereference

1 files changed, 8 insertions, 9 deletions

diff --git a/core/blockchain.go b/core/blockchain.go
index b3a7ffa..82e3b6c 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -2492,13 +2492,12 @@ func (bc *BlockChain) SubscribeBlockProcessingEvent(ch chan<- bool) event.Subscr
 }
 
 func (bc *BlockChain) ManualHead(hash common.Hash) error {
-	return bc.FastSyncCommitHead(hash)
-	//block := bc.GetBlockByHash(hash)
-	//if block == nil {
-	//	return errors.New("block not found")
-	//}
-	//bc.chainmu.Lock()
-	//defer bc.chainmu.Unlock()
-	//bc.writeHeadBlock(block)
-	//return nil
+	block := bc.GetBlockByHash(hash)
+	if block == nil {
+		return errors.New("block not found")
+	}
+	bc.chainmu.Lock()
+	defer bc.chainmu.Unlock()
+	bc.writeHeadBlock(block)
+	return nil
 }