From 14280e0820b616ebbb15f91257859a0338bb3d4e Mon Sep 17 00:00:00 2001 From: "Soren L. Hansen" Date: Thu, 22 Feb 2024 06:01:06 -0800 Subject: [PATCH] Prevent NPE when service lacks identity (#19987) Fixes a null pointer exception if `Alloc.SignIdentities` was called for any service and any service lacked an identity. Fixes #19986 --- .changelog/19986.txt | 3 +++ nomad/structs/workload_id.go | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changelog/19986.txt diff --git a/.changelog/19986.txt b/.changelog/19986.txt new file mode 100644 index 000000000..11f9666e2 --- /dev/null +++ b/.changelog/19986.txt @@ -0,0 +1,3 @@ +```release-note:bug +server: Prevent NPE when service lacks identity +``` diff --git a/nomad/structs/workload_id.go b/nomad/structs/workload_id.go index 368acb371..7aa4ff801 100644 --- a/nomad/structs/workload_id.go +++ b/nomad/structs/workload_id.go @@ -312,7 +312,10 @@ type WIHandle struct { WorkloadType WorkloadType } -func (w WIHandle) Equal(o WIHandle) bool { +func (w *WIHandle) Equal(o WIHandle) bool { + if w == nil { + return false + } return w.IdentityName == o.IdentityName && w.WorkloadIdentifier == o.WorkloadIdentifier && w.WorkloadType == o.WorkloadType