Skip to content

Commit

Permalink
Don't hang when reading an invalid rvalue (#77)
Browse files Browse the repository at this point in the history
Fixes #76
  • Loading branch information
pelletier authored Jun 30, 2016
1 parent b39f6ef commit 64ff1ea
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
1 change: 1 addition & 0 deletions lexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ func (l *tomlLexer) lexRvalue() tomlLexStateFn {
return l.lexKey
}

return l.errorf("no value can start with %c", next)
}

l.emit(tokenEOF)
Expand Down
14 changes: 14 additions & 0 deletions lexer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -692,3 +692,17 @@ func TestInvalidFloat(t *testing.T) {
token{Position{1, 7}, tokenEOF, ""},
})
}

func TestLexUnknownRvalue(t *testing.T) {
testFlow(t, `a = !b`, []token{
token{Position{1, 1}, tokenKey, "a"},
token{Position{1, 3}, tokenEqual, "="},
token{Position{1, 5}, tokenError, "no value can start with !"},
})

testFlow(t, `a = \b`, []token{
token{Position{1, 1}, tokenKey, "a"},
token{Position{1, 3}, tokenEqual, "="},
token{Position{1, 5}, tokenError, `no value can start with \`},
})
}
12 changes: 12 additions & 0 deletions parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,18 @@ func TestArrayNestedStrings(t *testing.T) {
})
}

func TestParseUnknownRvalue(t *testing.T) {
_, err := Load("a = !bssss")
if err == nil {
t.Error("Expecting a parse error")
}

_, err = Load("a = /b")
if err == nil {
t.Error("Expecting a parse error")
}
}

func TestMissingValue(t *testing.T) {
_, err := Load("a = ")
if err.Error() != "(1, 5): expecting a value" {
Expand Down

0 comments on commit 64ff1ea

Please sign in to comment.