diff options
Diffstat (limited to 'libgo/go/math/big/intmarsh.go')
-rw-r--r-- | libgo/go/math/big/intmarsh.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libgo/go/math/big/intmarsh.go b/libgo/go/math/big/intmarsh.go index 4ff57b6464e..ee1e4143ed9 100644 --- a/libgo/go/math/big/intmarsh.go +++ b/libgo/go/math/big/intmarsh.go @@ -59,7 +59,7 @@ func (z *Int) UnmarshalText(text []byte) error { return nil } -// The JSON marshallers are only here for API backward compatibility +// The JSON marshalers are only here for API backward compatibility // (programs that explicitly look for these two methods). JSON works // fine with the TextMarshaler only. @@ -70,5 +70,9 @@ func (x *Int) MarshalJSON() ([]byte, error) { // UnmarshalJSON implements the json.Unmarshaler interface. func (z *Int) UnmarshalJSON(text []byte) error { + // Ignore null, like in the main JSON package. + if string(text) == "null" { + return nil + } return z.UnmarshalText(text) } |