decoder: Avoid nil induced panic when collecting targets

hashicorp · Mar 29, 2023 · 286886d · 286886d
1 parent 336139f
commit 286886d
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/decoder/reference_targets.go b/decoder/reference_targets.go
@@ -774,17 +774,19 @@ func (d *PathDecoder) collectInferredReferenceTargetsForBody(addr lang.Address,
 			attrExpr = attr.Expr
 		}
 
-		if aSchema.Constraint != nil {
-			ref.NestedTargets = make(reference.Targets, 0)
-			expr, ok := newExpression(d.pathCtx, attrExpr, aSchema.Constraint).(ReferenceTargetsExpression)
-			if ok {
-				ctx := context.Background()
-				ref.NestedTargets = append(ref.NestedTargets, expr.ReferenceTargets(ctx, targetCtx)...)
-			}
-		} else {
-			if attrExpr != nil && !attrType.IsPrimitiveType() {
+		if attrExpr != nil {
+			if aSchema.Constraint != nil {
 				ref.NestedTargets = make(reference.Targets, 0)
-				ref.NestedTargets = append(ref.NestedTargets, decodeReferenceTargetsForComplexTypeExpr(attrAddr, attrExpr, attrType, bAddrSchema.ScopeId)...)
+				expr, ok := newExpression(d.pathCtx, attrExpr, aSchema.Constraint).(ReferenceTargetsExpression)
+				if ok {
+					ctx := context.Background()
+					ref.NestedTargets = append(ref.NestedTargets, expr.ReferenceTargets(ctx, targetCtx)...)
+				}
+			} else {
+				if !attrType.IsPrimitiveType() {
+					ref.NestedTargets = make(reference.Targets, 0)
+					ref.NestedTargets = append(ref.NestedTargets, decodeReferenceTargetsForComplexTypeExpr(attrAddr, attrExpr, attrType, bAddrSchema.ScopeId)...)
+				}
 			}
 		}