From 4e9184885bdb2666df6719b8095c96d906c12552 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Sat, 3 Feb 2024 09:26:47 +0100
Subject: [PATCH] fix: check for nil override in NewBlockChain (#357)

---
 core/blockchain.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/blockchain.go b/core/blockchain.go
index c92e0e36f631..36e58ca8df57 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -251,11 +251,13 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis
 	if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
 		return nil, genesisErr
 	}
-	if overrides.OverrideProofInBlock != nil {
-		chainConfig.ProofInBlocks = *overrides.OverrideProofInBlock
-	}
-	if overrides.OverrideOverlayStride != nil {
-		chainConfig.OverlayStride = *overrides.OverrideOverlayStride
+	if overrides != nil {
+		if overrides.OverrideProofInBlock != nil {
+			chainConfig.ProofInBlocks = *overrides.OverrideProofInBlock
+		}
+		if overrides.OverrideOverlayStride != nil {
+			chainConfig.OverlayStride = *overrides.OverrideOverlayStride
+		}
 	}
 	log.Info("")
 	log.Info(strings.Repeat("-", 153))