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

encoding/json: don't marshal unexported embedded fields of non struct type

Browse source 
Marshal must process unexported embedded fields of struct type,
looking for exported fields in those structs. However, it must
not process unexported embedded fields of non-struct type.

For example, consider:

    type t1 struct {
        X int
    }
    type t2 int
    type T struct {
        t1
        t2
    }

When considering T, Marshal must process t1 to find t1.X.
Marshal must not process t2, but it was. Fix that.

Fixes #18009

Change-Id: I62ba0b65ba30fd927990e101a26405a9998787a3
Reviewed-on: https://go-review.googlesource.com/33773
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
thoeni 2016-12-01 21:57:39 +00:00 • committed by Russ Cox
parent e2160cc571
commit 296b35382c
2 changed files with 54 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/encoding/json/encode.go
View file

@ -1093,7 +1093,7 @@ func typeFields(t reflect.Type) []field {
// Scan f.typ for fields to include.
for i := 0; i < f.typ.NumField(); i++ {
sf := f.typ.Field(i)
if sf.PkgPath != "" && !sf.Anonymous { // unexported
if sf.PkgPath != "" && (!sf.Anonymous || sf.Type.Kind() != reflect.Struct) { // unexported
continue
}
tag := sf.Tag.Get("json")