Merge pull request #801 from wader/interp-synthetic-raw-inf-recur

wader · web-flow · commit 7c8fa05e300e · 2023-10-29T16:23:41.000+01:00
interp: Fix infinite recursion when casting synthetic raw value into …
diff --git a/internal/gojqex/totype.go b/internal/gojqex/totype.go
@@ -89,6 +89,8 @@ func ToGoJQValueFn(v any, valueFn func(v any) (any, error)) (any, error) {
 			vvs[k] = v
 		}
 		return vvs, nil
+	case error:
+		return nil, vv
 	default:
 		nv, err := valueFn(vv)
 		if err != nil {
diff --git a/pkg/interp/decode.go b/pkg/interp/decode.go
@@ -634,12 +634,15 @@ func (v decodeValue) JQValueToGoJQEx(optsFn func() (*Options, error)) any {
 		return v.JQValueToGoJQ()
 	}
 
-	bv, err := v.decodeValueBase.ToBinary()
-	if err != nil {
-		return err
+	if s, ok := v.dv.V.(scalar.Scalarable); ok && !s.ScalarFlags().IsSynthetic() {
+		bv, err := v.ToBinary()
+		if err != nil {
+			return err
+		}
+		return bv.JQValueToGoJQEx(optsFn)
 	}
 
-	return bv.JQValueToGoJQEx(optsFn)
+	return v.JQValueToGoJQ()
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,8 @@ func ToGoJQValueFn(v any, valueFn func(v any) (any, error)) (any, error) {`
`89`	`89`	`vvs[k] = v`
`90`	`90`	`}`
`91`	`91`	`return vvs, nil`
	`92`	`+ case error:`
	`93`	`+ return nil, vv`
`92`	`94`	`default:`
`93`	`95`	`nv, err := valueFn(vv)`
`94`	`96`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -634,12 +634,15 @@ func (v decodeValue) JQValueToGoJQEx(optsFn func() (*Options, error)) any {`
`634`	`634`	`return v.JQValueToGoJQ()`
`635`	`635`	`}`
`636`	`636`
`637`		`- bv, err := v.decodeValueBase.ToBinary()`
`638`		`- if err != nil {`
`639`		`- return err`
	`637`	`+ if s, ok := v.dv.V.(scalar.Scalarable); ok && !s.ScalarFlags().IsSynthetic() {`
	`638`	`+ bv, err := v.ToBinary()`
	`639`	`+ if err != nil {`
	`640`	`+ return err`
	`641`	`+ }`
	`642`	`+ return bv.JQValueToGoJQEx(optsFn)`
`640`	`643`	`}`
`641`	`644`
`642`		`- return bv.JQValueToGoJQEx(optsFn)`
	`645`	`+ return v.JQValueToGoJQ()`
`643`	`646`
`644`	`647`	`}`
`645`	`648`