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: encode nil Marshaler as "null"

Browse source 
Fixes #16042.

Change-Id: I0a28aa004246b7b0ffaaab457e077ad9035363c2
Reviewed-on: https://go-review.googlesource.com/31932
Reviewed-by: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Emmanuel Odeke 2016-10-24 21:20:04 -07:00 • committed by Russ Cox
parent c439a5d8b7
commit add721ef91
2 changed files with 43 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -443,7 +443,11 @@ func marshalerEncoder(e *encodeState, v reflect.Value, opts encOpts) {
e.WriteString("null")
return
}
m := v.Interface().(Marshaler)
m, ok := v.Interface().(Marshaler)
if !ok {
e.WriteString("null")
return
}
b, err := m.MarshalJSON()
if err == nil {
// copy JSON into buffer, checking validity.