• Daniel Martí's avatar
    encoding/json: fix handling of nil anonymous structs · 969b9d81
    Daniel Martí authored
    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: 's avatarBrad Fitzpatrick <bradfitz@golang.org>
    969b9d81
Name
Last commit
Last update
..
archive Loading commit data...
bufio Loading commit data...
builtin Loading commit data...
bytes Loading commit data...
cmd Loading commit data...
compress Loading commit data...
container Loading commit data...
context Loading commit data...
crypto Loading commit data...
database/sql Loading commit data...
debug Loading commit data...
encoding Loading commit data...
errors Loading commit data...
expvar Loading commit data...
flag Loading commit data...
fmt Loading commit data...
go Loading commit data...
hash Loading commit data...
html Loading commit data...
image Loading commit data...
index/suffixarray Loading commit data...
internal Loading commit data...
io Loading commit data...
log Loading commit data...
math Loading commit data...
mime Loading commit data...
net Loading commit data...
os Loading commit data...
path Loading commit data...
plugin Loading commit data...
reflect Loading commit data...
regexp Loading commit data...
runtime Loading commit data...
sort Loading commit data...
strconv Loading commit data...
strings Loading commit data...
sync Loading commit data...
syscall Loading commit data...
testing Loading commit data...
text Loading commit data...
time Loading commit data...
unicode Loading commit data...
unsafe Loading commit data...
vendor/golang_org/x Loading commit data...
Make.dist Loading commit data...
all.bash Loading commit data...
all.bat Loading commit data...
all.rc Loading commit data...
androidtest.bash Loading commit data...
bootstrap.bash Loading commit data...
buildall.bash Loading commit data...
clean.bash Loading commit data...
clean.bat Loading commit data...
clean.rc Loading commit data...
cmp.bash Loading commit data...
iostest.bash Loading commit data...
make.bash Loading commit data...
make.bat Loading commit data...
make.rc Loading commit data...
naclmake.bash Loading commit data...
nacltest.bash Loading commit data...
race.bash Loading commit data...
race.bat Loading commit data...
run.bash Loading commit data...
run.bat Loading commit data...
run.rc Loading commit data...