From 983a32b48de887cad2e4f6e5df7236a615860c6d Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 18 Dec 2024 16:19:39 -0800 Subject: [PATCH] solver: protect against nil dereference on uninitialized vertex Signed-off-by: Tonis Tiigi --- solver/jobs.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/solver/jobs.go b/solver/jobs.go index d8cce3abdcf7..68b4e53c969e 100644 --- a/solver/jobs.go +++ b/solver/jobs.go @@ -734,10 +734,12 @@ func (j *Job) walkProvenance(ctx context.Context, e Edge, f func(ProvenanceProvi visited[e.Vertex.Digest()] = struct{}{} if st, ok := j.list.actives[e.Vertex.Digest()]; ok { st.mu.Lock() - if wp, ok := st.op.op.(ProvenanceProvider); ok { - if err := f(wp); err != nil { - st.mu.Unlock() - return err + if st.op != nil && st.op.op != nil { + if wp, ok := st.op.op.(ProvenanceProvider); ok { + if err := f(wp); err != nil { + st.mu.Unlock() + return err + } } } st.mu.Unlock()