Merge pull request #5540 from oasisprotocol/ptrus/stable/22.2.x/backp…

…ort-5403 [BACKPORT/22.2.x] 5403
oasisprotocol · Jan 24, 2024 · 15ebccf · 15ebccf
2 parents c4d5b83 + 3aaf736
commit 15ebccf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.changelog/5403.bugfix.md b/.changelog/5403.bugfix.md
@@ -0,0 +1 @@
+go/worker/client: Fix nil dereference on early Query
diff --git a/go/worker/client/committee/node.go b/go/worker/client/committee/node.go
@@ -143,13 +143,14 @@ func (n *Node) Query(ctx context.Context, round uint64, method string, args []by
 	// Fetch the active descriptor so we can get the current message limits.
 	n.commonNode.CrossNode.Lock()
 	dsc := n.commonNode.CurrentDescriptor
-	latestRound := n.commonNode.CurrentBlock.Header.Round
+	blk := n.commonNode.CurrentBlock
 	n.commonNode.CrossNode.Unlock()
 
-	if dsc == nil {
+	if dsc == nil || blk == nil {
 		return nil, api.ErrNoHostedRuntime
 	}
 	maxMessages := dsc.Executor.MaxMessages
+	latestRound := n.commonNode.CurrentBlock.Header.Round
 
 	var resolvedRound uint64
 	queryFn := func(round uint64) ([]byte, error) {