diff options
| author | Daniel Martí <mvdan@mvdan.cc> | 2018-08-26 06:24:33 -0600 |
|---|---|---|
| committer | Daniel Martí <mvdan@mvdan.cc> | 2018-08-26 17:12:02 +0000 |
| commit | 969b9d8127c0ef3bbffeb1fa7d13a7ec1afccce4 (patch) | |
| tree | 629ad617b0fa06d44e24d7c6f94ecd7c9b50a5f7 /src/encoding/json/encode.go | |
| parent | 21af0c1699909454baa4fc6890fe9a1d337faf9c (diff) | |
| download | go-969b9d8127c0ef3bbffeb1fa7d13a7ec1afccce4.tar.xz | |
encoding/json: fix handling of nil anonymous structs
Given the following types:
type S2 struct{ Field string }
type S struct{ *S2 }
Marshalling a value of type T1 should result in "{}", as there's no way
to access any value of T2.Field. This is how Go 1.10 and earlier
versions behave.
However, in the recent refactor golang.org/cl/125417 I broke this logic.
When the encoder found an anonymous struct pointer field that was nil,
it no longer skipped the embedded fields underneath it. This can be seen
in the added test:
--- FAIL: TestAnonymousFields/EmbeddedFieldBehindNilPointer (0.00s)
encode_test.go:430: Marshal() = "{\"Field\":\"\\u003c*json.S2 Value\\u003e\"}", want "{}"
The human error was a misplaced label, meaning we weren't actually
skipping the right loop iteration. Fix that.
Change-Id: Iba8a4a77d358dac73dcba4018498fe4f81afa263
Reviewed-on: https://go-review.googlesource.com/131376
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/encoding/json/encode.go')
| -rw-r--r-- | src/encoding/json/encode.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/encoding/json/encode.go b/src/encoding/json/encode.go index 7e5e209b4f..f10124e67d 100644 --- a/src/encoding/json/encode.go +++ b/src/encoding/json/encode.go @@ -629,12 +629,12 @@ type structEncoder struct { func (se structEncoder) encode(e *encodeState, v reflect.Value, opts encOpts) { next := byte('{') +FieldLoop: for i := range se.fields { f := &se.fields[i] // Find the nested struct field by following f.index. fv := v - FieldLoop: for _, i := range f.index { if fv.Kind() == reflect.Ptr { if fv.IsNil() { |