solver: FindRef should return ok=false if ref is invalid

Signed-off-by: Justin Chadwell <[email protected]>
moby · Apr 18, 2023 · d4090c6 · d4090c6
1 parent dd651bd
commit d4090c6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/solver/result/result.go b/solver/result/result.go
@@ -61,6 +61,8 @@ func (r *Result[T]) FindRef(key string) (T, bool) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
+	var zero T
+
 	if r.Refs != nil {
 		if ref, ok := r.Refs[key]; ok {
 			return ref, true
@@ -70,10 +72,12 @@ func (r *Result[T]) FindRef(key string) (T, bool) {
 				return ref, true
 			}
 		}
-		var t T
-		return t, false
+		return zero, false
+	}
+	if r.Ref != zero {
+		return r.Ref, true
 	}
-	return r.Ref, true
+	return zero, false
 }
 
 func (r *Result[T]) EachRef(fn func(T) error) (err error) {