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

encoding/json: don't panic marshaling anonymous non-struct field

Browse source 
Add a check for this case and don't try to follow the anonymous
type's non-existent fields.

Fixes #4474.

R=rsc
CC=golang-dev
https://golang.org/cl/6945065
This commit is contained in:
Thomas Kappler 2013-01-02 17:39:41 -05:00 • committed by Russ Cox
parent a29702f067
commit cdec0850f8
2 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -617,13 +617,20 @@ func typeFields(t reflect.Type) []field {
index := make([]int, len(f.index)+1)
copy(index, f.index)
index[len(f.index)] = i
ft := sf.Type
if ft.Name() == "" && ft.Kind() == reflect.Ptr {
// Follow pointer.
ft = ft.Elem()
}
// Record found field and index sequence.
if name != "" || !sf.Anonymous {
if name != "" || !sf.Anonymous || ft.Kind() != reflect.Struct {
tagged := name != ""
if name == "" {
name = sf.Name
}
fields = append(fields, field{name, tagged, index, sf.Type,
fields = append(fields, field{name, tagged, index, ft,
opts.Contains("omitempty"), opts.Contains("string")})
if count[f.typ] > 1 {
// If there were multiple instances, add a second,
@ -636,11 +643,6 @@ func typeFields(t reflect.Type) []field {
}
// Record new anonymous struct to explore in next round.
ft := sf.Type
if ft.Name() == "" {
// Must be pointer.
ft = ft.Elem()
}
nextCount[ft]++
if nextCount[ft] == 1 {
next = append(next, field{name: ft.Name(), index: index, typ: ft})