Skip to content

Commit

Permalink
encoding/json: validate strings when decoding into Number
Browse files Browse the repository at this point in the history
Unmarshaling a string into a json.Number should first check that
the string is a valid Number.
If not, we should fail without decoding it.

Fixes #14702
  • Loading branch information
breml committed Sep 16, 2019
1 parent 6c6ad30 commit fe69bb6
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/encoding/json/decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,9 @@ func (d *decodeState) literalStore(item []byte, v reflect.Value, fromQuoted bool
}
v.SetBytes(b[:n])
case reflect.String:
if v.Type() == numberType && !isValidNumber(string(s)) {
return fmt.Errorf("json: invalid number literal, trying to unmarshal %q into Number", item)
}
v.SetString(string(s))
case reflect.Interface:
if v.NumMethod() == 0 {
Expand Down
31 changes: 31 additions & 0 deletions src/encoding/json/decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,37 @@ var unmarshalTests = []unmarshalTest{
Offset: 29,
},
},
// #14702
{
in: `invalid`,
ptr: new(Number),
err: &SyntaxError{
msg: "invalid character 'i' looking for beginning of value",
Offset: 1,
},
},
{
in: `"invalid"`,
ptr: new(Number),
err: fmt.Errorf("json: invalid number literal, trying to unmarshal %q into Number", `"invalid"`),
},
{
in: `{"A":"invalid"}`,
ptr: new(struct{ A Number }),
err: fmt.Errorf("json: invalid number literal, trying to unmarshal %q into Number", `"invalid"`),
},
{
in: `{"A":"invalid"}`,
ptr: new(struct {
A Number `json:",string"`
}),
err: fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into json.Number", `invalid`),
},
{
in: `{"A":"invalid"}`,
ptr: new(map[string]Number),
err: fmt.Errorf("json: invalid number literal, trying to unmarshal %q into Number", `"invalid"`),
},
}

func TestMarshal(t *testing.T) {
Expand Down

0 comments on commit fe69bb6

Please sign in to comment.