Skip to content

fix: self-referential thunks produce clean error instead of StackOverflowError #1020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
He-Pin wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

fix: self-referential thunks produce clean error instead of StackOverflowError #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion sjsonnet/src/sjsonnet/Val.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,18 @@ final class LazyExpr(
private var scope: ValScope,
private var ev: Evaluator)
extends Lazy {
private var evaluating: Boolean = false
def value: Val = {
if (ev == null) exprOrVal.asInstanceOf[Val]
else {
else if (evaluating) {
Error.fail("Infinite recursion detected (self-referential thunk)")
} else {
evaluating = true
val r = ev.visitExpr(exprOrVal.asInstanceOf[Expr])(scope)
exprOrVal = r // cache result
scope = null.asInstanceOf[sjsonnet.ValScope] // allow GC
ev = null // sentinel: marks as computed
evaluating = false
r
}
}
Expand Down
1 change: 1 addition & 0 deletions sjsonnet/test/resources/new_test_suite/error.self_referential_thunk.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
local x = x; x
2 changes: 2 additions & 0 deletions sjsonnet/test/resources/new_test_suite/error.self_referential_thunk.jsonnet.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sjsonnet.Error: Infinite recursion detected (self-referential thunk)
at [<root>].(error.self_referential_thunk.jsonnet:1:7)
Loading