Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,42 @@ func Test_Decoder_UseNumber(t *testing.T) {
assertEq(t, "json.Number", "json.Number", fmt.Sprintf("%T", v["a"]))
}

func Test_Decoder_Number_OutOfFloat64Range(t *testing.T) {
// A json.Number keeps the literal verbatim, so a number whose magnitude
// overflows float64 is still a valid json.Number and must decode without
// error, matching encoding/json. See
// https://github.com/goccy/go-json/issues/555.
valid := []string{"1e999", "-1e999", "1e-999", "1.7976931348623157e400", strings.Repeat("9", 400)}
for _, in := range valid {
var n json.Number
assertErr(t, json.Unmarshal([]byte(in), &n))
assertEq(t, "Unmarshal into json.Number", in, string(n))

var sn json.Number
assertErr(t, json.NewDecoder(strings.NewReader(in)).Decode(&sn))
assertEq(t, "Decoder.Decode into json.Number", in, string(sn))

// The common real-world trigger: a json.Number struct field.
var v struct {
N json.Number `json:"n"`
}
assertErr(t, json.Unmarshal([]byte(`{"n":`+in+`}`), &v))
assertEq(t, "Unmarshal into json.Number field", in, string(v.N))
}
// Genuinely malformed numbers must still be rejected on both paths.
invalid := []string{"1e2e3", "1e+-2", "1.2.3"}
for _, in := range invalid {
var n json.Number
if err := json.Unmarshal([]byte(in), &n); err == nil {
t.Fatalf("Unmarshal(%q) into json.Number: expected error, got %q", in, string(n))
}
var sn json.Number
if err := json.NewDecoder(strings.NewReader(in)).Decode(&sn); err == nil {
t.Fatalf("Decoder.Decode(%q) into json.Number: expected error, got %q", in, string(sn))
}
}
}

func Test_Decoder_DisallowUnknownFields(t *testing.T) {
dec := json.NewDecoder(strings.NewReader(`{"x": 1}`))
dec.DisallowUnknownFields()
Expand Down
17 changes: 15 additions & 2 deletions internal/decoder/number.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,33 @@ func (d *numberDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) e
if err != nil {
return err
}
if _, err := strconv.ParseFloat(*(*string)(unsafe.Pointer(&bytes)), 64); err != nil {
if err := validateNumber(bytes); err != nil {
return errors.ErrSyntax(err.Error(), s.totalOffset())
}
d.op(p, json.Number(string(bytes)))
s.reset()
return nil
}

// validateNumber returns an error if bytes is not a syntactically valid number
// literal. A number whose magnitude overflows float64 (strconv.ErrRange) is still a valid
// JSON number and is preserved verbatim as a json.Number, matching encoding/json;
// only genuine syntax errors are rejected.
func validateNumber(bytes []byte) error {
if _, err := strconv.ParseFloat(*(*string)(unsafe.Pointer(&bytes)), 64); err != nil {
if ne, ok := err.(*strconv.NumError); !ok || ne.Err != strconv.ErrRange {
return err
}
}
return nil
}

func (d *numberDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe.Pointer) (int64, error) {
bytes, c, err := d.decodeByte(ctx.Buf, cursor)
if err != nil {
return 0, err
}
if _, err := strconv.ParseFloat(*(*string)(unsafe.Pointer(&bytes)), 64); err != nil {
if err := validateNumber(bytes); err != nil {
return 0, errors.ErrSyntax(err.Error(), c)
}
cursor = c
Expand Down