From e0df027c1164fa44c7c0555112e0524ab6449ca9 Mon Sep 17 00:00:00 2001
From: Zahary Karadjov <zahary@gmail.com>
Date: Thu, 4 Feb 2021 17:24:34 +0200
Subject: [PATCH] Avoid a possible nil dereference

---
 beacon_chain/eth1_monitor.nim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/beacon_chain/eth1_monitor.nim b/beacon_chain/eth1_monitor.nim
index 070e758c2..fc98946ae 100644
--- a/beacon_chain/eth1_monitor.nim
+++ b/beacon_chain/eth1_monitor.nim
@@ -798,7 +798,9 @@ proc resetState(m: Eth1Monitor) {.async.} =
   m.eth1Chain.clear()
   m.latestEth1BlockNumber = 0
 
-  await m.dataProvider.close()
+  if m.dataProvider != nil:
+    await m.dataProvider.close()
+    m.dataProvider = nil
 
 proc stop*(m: Eth1Monitor) {.async.} =
   if m.state == Started:
@@ -819,7 +821,7 @@ proc syncBlockRange(m: Eth1Monitor,
                     merkleizer: ref DepositsMerkleizer,
                     fromBlock, toBlock,
                     fullSyncFromBlock: Eth1BlockNumber) {.gcsafe, async.} =
-  doAssert m.eth1Chain.blocks.len > 0
+  doAssert m.eth1Chain.blocks.len > 0 and m.dataProvider != nil
 
   var currentBlock = fromBlock
   while currentBlock <= toBlock: