Merge pull request #5423 from oasisprotocol/kostko/fix/consensus-ligh…

…tblock-nil
oasisprotocol · Nov 1, 2023 · 1285238 · 1285238
2 parents 357eab8 + 772a182
commit 1285238
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.changelog/5423.bugfix.md b/.changelog/5423.bugfix.md
@@ -0,0 +1,4 @@
+go/consensus: Do not crash on nil result from Commit
+
+The Commit function can return both a nil error and a nil result in case
+the given block is not available yet.
diff --git a/go/consensus/cometbft/full/common.go b/go/consensus/cometbft/full/common.go
@@ -586,7 +586,7 @@ func (n *commonNode) getLightBlock(ctx context.Context, height int64, allowPendi
 	}
 
 	commit, err := cmtcore.Commit(n.rpcCtx, &tmHeight)
-	if err == nil && commit.Header != nil {
+	if err == nil && commit != nil && commit.Header != nil {
 		lb.SignedHeader = &commit.SignedHeader
 		tmHeight = commit.Header.Height
 	} else if allowPending {