re
/
go-json
forked from mirror/go-json
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from goccy/feature/fix-null-in-string 

Fix null in string type
This commit is contained in:
Masaaki Goshima 2020-08-08 12:23:58 +09:00 committed by GitHub
parent 96528bcc62 460499ee65
commit 4f06b13b6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decode_string.go
View File

@ -135,7 +135,7 @@ func (d *stringDecoder) decodeByte(buf []byte, cursor int64) ([]byte, int64, err
if buf[cursor+3] != 'l' { if buf[cursor+3] != 'l' {
return nil, 0, errInvalidCharacter(buf[cursor+3], "null", cursor) return nil, 0, errInvalidCharacter(buf[cursor+3], "null", cursor)
} }
cursor += 5 cursor += 4
return []byte{}, cursor, nil return []byte{}, cursor, nil
default: default:
goto ERROR goto ERROR

7
decode_test.go
View File

@ -135,6 +135,13 @@ func Test_Decoder(t *testing.T) {
assertEq(t, "struct.D.AA", 2, v.D.AA) assertEq(t, "struct.D.AA", 2, v.D.AA)
assertEq(t, "struct.D.BB", "world", v.D.BB) assertEq(t, "struct.D.BB", "world", v.D.BB)
assertEq(t, "struct.D.CC", true, v.D.CC) assertEq(t, "struct.D.CC", true, v.D.CC)
t.Run("struct.null", func(t *testing.T) {
var v struct {
A string
}
assertErr(t, json.Unmarshal([]byte(`{"a":null}`), &v))
assertEq(t, "string is null", v.A, "")
})
}) })
t.Run("interface", func(t *testing.T) { t.Run("interface", func(t *testing.T) {
t.Run("number", func(t *testing.T) { t.Run("number", func(t *testing.T) {