Skip to content

Commit

Permalink
decode: error on _ before exponent in floats (#647)
Browse files Browse the repository at this point in the history
Fixes #646
  • Loading branch information
pelletier committed Oct 29, 2021
1 parent 19751e8 commit 3694ae8
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
3 changes: 3 additions & 0 deletions decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,9 @@ func checkAndRemoveUnderscoresFloats(b []byte) ([]byte, error) {
if !before {
return nil, newDecodeError(b[i-1:i+1], "number must have at least one digit between underscores")
}
if i < len(b)-1 && (b[i+1] == 'e' || b[i+1] == 'E') {
return nil, newDecodeError(b[i+1:i+2], "cannot have underscore before exponent")
}
before = false
case 'e', 'E':
if i < len(b)-1 && b[i+1] == '_' {
Expand Down
22 changes: 18 additions & 4 deletions unmarshaler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,16 @@ func TestUnmarshal_Floats(t *testing.T) {
assert.True(t, math.IsNaN(v))
},
},
{
desc: "underscore after integer part",
input: `1_e2`,
err: true,
},
{
desc: "underscore after integer part",
input: `1.0_e2`,
err: true,
},
}

type doc struct {
Expand All @@ -215,11 +225,15 @@ func TestUnmarshal_Floats(t *testing.T) {
t.Run(e.desc, func(t *testing.T) {
doc := doc{}
err := toml.Unmarshal([]byte(`A = `+e.input), &doc)
require.NoError(t, err)
if e.testFn != nil {
e.testFn(t, doc.A)
if e.err {
require.Error(t, err)
} else {
assert.Equal(t, e.expected, doc.A)
require.NoError(t, err)
if e.testFn != nil {
e.testFn(t, doc.A)
} else {
assert.Equal(t, e.expected, doc.A)
}
}
})
}
Expand Down

0 comments on commit 3694ae8

Please sign in to comment.