encoding/json: fix decoding of JSON null values

JSON decoding currently fails for null values bound to any type
which does implement the JSON Unmarshaler interface without checking
for null values (such as time.Time).

It also fails for types implementing the TextUnmarshaler interface.

The expected behavior of the JSON decoding engine in such case is
to process null by keeping the value unchanged without producing
any error.

Make sure null values are handled by the decoding engine itself,
and never passed to the UnmarshalText or UnmarshalJSON methods.

Fixes #9037

Change-Id: I261d85587ba543ef6f1815555b2af9311034d5bb
Reviewed-on: https://go-review.googlesource.com/9376
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
Didier Spezia 2015-04-28 11:20:19 +00:00 committed by Russ Cox
parent 1421bc10a4
commit 1a99ba55df
2 changed files with 76 additions and 2 deletions

View file

@ -358,7 +358,7 @@ func (d *decodeState) indirect(v reflect.Value, decodingNull bool) (Unmarshaler,
if v.IsNil() {
v.Set(reflect.New(v.Type().Elem()))
}
if v.Type().NumMethod() > 0 {
if v.Type().NumMethod() > 0 && !decodingNull {
if u, ok := v.Interface().(Unmarshaler); ok {
return u, nil, reflect.Value{}
}