Backport of consul: handle nil multierror pointer correctly into rele…

…ase/1.9.x (#24516) Co-authored-by: Tim Gross <[email protected]>
hashicorp · Nov 20, 2024 · 824ce0c · 824ce0c
1 parent e405392
commit 824ce0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.changelog/24513.txt b/.changelog/24513.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+consul: Fixed a bug where failures when syncing Consul checks could panic the Nomad agent
+```
diff --git a/command/agent/consul/service_client.go b/command/agent/consul/service_client.go
@@ -1105,7 +1105,7 @@ func (c *ServiceClient) sync(reason syncReason) error {
 		if err != nil {
 			metrics.IncrCounter([]string{"client", "consul", "sync_failure"}, 1)
 			err = fmt.Errorf("failed to query Consul checks: %w", err)
-			if mErr.Len() == 0 {
+			if mErr == nil || mErr.Len() == 0 {
 				return err
 			} else {
 				mErr = multierror.Append(mErr, err)