From a7d4be004801e413dfa1b902972f60c20eb33e09 Mon Sep 17 00:00:00 2001
From: noot <36753753+noot@users.noreply.github.com>
Date: Fri, 3 Dec 2021 10:03:19 -0500
Subject: [PATCH] fix(dot/sync): add nil header checks (#2099)

---
 dot/sync/chain_sync.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dot/sync/chain_sync.go b/dot/sync/chain_sync.go
index 594815dc82..c933dabde7 100644
--- a/dot/sync/chain_sync.go
+++ b/dot/sync/chain_sync.go
@@ -711,9 +711,19 @@ func handleReadyBlock(bd *types.BlockData, pendingBlocks DisjointBlockSet, ready
 	// if we're expecting headers, validate should ensure we have a header
 	if bd.Header == nil {
 		block := pendingBlocks.getBlock(bd.Hash)
+		if block == nil {
+			logger.Criticalf("block with unknown header is ready: hash=%s", bd.Hash)
+			return
+		}
+
 		bd.Header = block.header
 	}
 
+	if bd.Header == nil {
+		logger.Criticalf("new ready block number (unknown) with hash %s", bd.Hash)
+		return
+	}
+
 	logger.Tracef("new ready block number %s with hash %s", bd.Header.Number, bd.Hash)
 
 	ready := []*types.BlockData{bd}