Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-11-08 20:51:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

json: treat renamed byte slices the same as []byte

Browse source 
Fixes #2163.

R=rsc
CC=golang-dev
https://golang.org/cl/5488068
This commit is contained in:
Rob Pike 2011-12-14 11:03:28 -08:00
parent 465aba66c1
commit 34c7765fe5
2 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pkg/encoding/json/encode.go
View file

@ -339,13 +339,10 @@ func (e *encodeState) reflectValueQuoted(v reflect.Value, quoted bool) {
e.WriteString("null")
break
}
// Slices can be marshalled as nil, but otherwise are handled
// as arrays.
fallthrough
case reflect.Array:
if v.Type() == byteSliceType {
if v.Type().Elem().Kind() == reflect.Uint8 {
// Byte slices get special treatment; arrays don't.
s := v.Bytes()
e.WriteByte('"')
s := v.Interface().([]byte)
if len(s) < 1024 {
// for small buffers, using Encode directly is much faster.
dst := make([]byte, base64.StdEncoding.EncodedLen(len(s)))
@ -361,6 +358,10 @@ func (e *encodeState) reflectValueQuoted(v reflect.Value, quoted bool) {
e.WriteByte('"')
break
}
// Slices can be marshalled as nil, but otherwise are handled
// as arrays.
fallthrough
case reflect.Array:
e.WriteByte('[')
n := v.Len()
for i := 0; i < n; i++ {