Skip to content

fix: don't panic on incomplete var declaration with origin #153

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
flemzord wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: don't panic on incomplete var declaration with origin #153

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
2 changes: 1 addition & 1 deletion internal/analysis/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func (res *CheckResult) check() {
res.checkDuplicateVars(*varDecl.Name, varDecl)
}

if varDecl.Origin != nil {
if varDecl.Origin != nil && *varDecl.Origin != nil && varDecl.Type != nil {
res.checkExpression(*varDecl.Origin, varDecl.Type.Name)
res.unifyNodeWith(*varDecl.Origin, res.GetVarDeclType(varDecl))
}
Expand Down
23 changes: 23 additions & 0 deletions internal/analysis/check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,3 +1193,26 @@ send [USD/2 100000] (
)

}

func TestIncompleteVarOriginDoesNotPanic(t *testing.T) {
t.Parallel()

// regression test for EN-1116: these incomplete var declarations
// used to make CheckSource panic with a nil pointer dereference
inputs := []string{
`vars { number $n = `,
`vars { number $n = }`,
`vars { $x = }`,
`vars { $x = `,
`vars { number $n = ` + "\n" + `}`,
}

for _, input := range inputs {
t.Run(input, func(t *testing.T) {
t.Parallel()

diagnostics := checkSource(input)
require.NotEmpty(t, diagnostics)
})
}
}
2 changes: 1 addition & 1 deletion internal/parser/__snapshots__/parser_fault_tolerance_test.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ parser.Program{
},
Name: "asset",
},
Origin: &nil,
Origin: (*parser.ValueExpr)(nil),
},
},
},
Expand Down
8 changes: 6 additions & 2 deletions internal/parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ func parseVarDeclaration(varDecl antlrParser.IVarDeclarationContext) *VarDeclara
var origin *ValueExpr
if varDecl.VarOrigin() != nil {
expr := parseValueExpr(varDecl.VarOrigin().ValueExpr())
origin = &expr
// when the origin expression is missing or malformed,
// parseValueExpr returns nil; do not wrap it in a non-nil pointer
if expr != nil {
origin = &expr
}
}

return &VarDeclaration{
Expand Down Expand Up @@ -570,7 +574,7 @@ func parseSaveStatement(saveCtx *antlrParser.SaveStatementContext) *SaveStatemen
return &SaveStatement{
Range: ctxToRange(saveCtx),
SentValue: parseSentValue(saveCtx.SentValue()),
Account: parseValueExpr(saveCtx.ValueExpr()),
Account: parseValueExpr(saveCtx.ValueExpr()),
}
}

Expand Down