languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-02 11:50:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

expvar: Ensure strings are written as valid JSON.

Browse source 
Change-Id: I5147dbf4e85cf42cd1f32c57861e4c16d9dbd049
Reviewed-on: https://go-review.googlesource.com/21529
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>
This commit is contained in:
David Symonds 2016-04-06 11:53:26 +10:00
parent 870d997ab4
commit 6f2a8810b0
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/expvar/expvar.go
View file

@ -219,8 +219,10 @@ type String struct {
func (v *String) String() string { func (v *String) String() string {
v.mu.RLock() v.mu.RLock()
defer v.mu.RUnlock() s := v.s
return strconv.Quote(v.s) v.mu.RUnlock()
b, _ := json.Marshal(s)
return string(b)
} }
func (v *String) Set(value string) { func (v *String) Set(value string) {

10
src/expvar/expvar_test.go
View file

@ -142,8 +142,14 @@ func TestString(t *testing.T) {
t.Errorf("name.s = %q, want \"Mike\"", name.s) t.Errorf("name.s = %q, want \"Mike\"", name.s)
} }
if s := name.String(); s != "\"Mike\"" { if s, want := name.String(), `"Mike"`; s != want {
t.Errorf("reqs.String() = %q, want \"\"Mike\"\"", s) t.Errorf("from %q, name.String() = %q, want %q", name.s, s, want)
}
// Make sure we produce safe JSON output.
name.Set(`<`)
if s, want := name.String(), "\"\\u003c\""; s != want {
t.Errorf("from %q, name.String() = %q, want %q", name.s, s, want)
} }
} }