qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 07:50:23 -07:00
Code Releases Activity

Handle \r as a whitespace when parsing JSON string.

Browse Source 
Fixes #272.

R=rsc
https://golang.org/cl/161061
This commit is contained in:
Andrew Skiba 2009-11-30 12:03:26 -08:00 committed by Russ Cox
parent c78710f53e
commit 68d3b6e51a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/json/parse.go
View File

@ -198,7 +198,7 @@ func punct(c byte) bool {
return c == '"' || c == '[' || c == ']' || c == ':' || c == '{' || c == '}' || c == ',' return c == '"' || c == '[' || c == ']' || c == ':' || c == '{' || c == '}' || c == ','
} }
func white(c byte) bool { return c == ' ' || c == '\t' || c == '\n' || c == '\v' } func white(c byte) bool { return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\v' }
func skipwhite(p string, i int) int { func skipwhite(p string, i int) int {
for i < len(p) && white(p[i]) { for i < len(p) && white(p[i]) {

11
src/pkg/json/struct_test.go
View File

@ -66,6 +66,17 @@ func check(t *testing.T, ok bool, name string, v interface{}) {
} }
} }
const whiteSpaceEncoded = " \t{\n\"s\"\r:\"string\"\v}"
func TestUnmarshalWhitespace(t *testing.T) {
var m myStruct;
ok, errtok := Unmarshal(whiteSpaceEncoded, &m);
if !ok {
t.Fatalf("Unmarshal failed near %s", errtok)
}
check(t, m.S == "string", "string", m.S);
}
func TestUnmarshal(t *testing.T) { func TestUnmarshal(t *testing.T) {
var m myStruct; var m myStruct;
m.F = true; m.F = true;