diff options
| author | Robert Griesemer <gri@golang.org> | 2014-10-01 16:24:17 -0700 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2014-10-01 16:24:17 -0700 |
| commit | 7e8218aedd30a3dacb2642ef37ff1f68657071b2 (patch) | |
| tree | 992a48053eac9c88dd83515c16aaf8844d6d0c88 /src/encoding/json/decode_test.go | |
| parent | 94f3d8cfed14e4bcb99a0389ea083cfc2ae3ab1d (diff) | |
| download | go-7e8218aedd30a3dacb2642ef37ff1f68657071b2.tar.xz | |
encoding/json: don't panic on incorrect map argument
Fixes #8305.
LGTM=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/145680044
Diffstat (limited to 'src/encoding/json/decode_test.go')
| -rw-r--r-- | src/encoding/json/decode_test.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/encoding/json/decode_test.go b/src/encoding/json/decode_test.go index 238a87fd66..d95657d729 100644 --- a/src/encoding/json/decode_test.go +++ b/src/encoding/json/decode_test.go @@ -406,6 +406,13 @@ var unmarshalTests = []unmarshalTest{ ptr: new(string), out: "hello\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdworld", }, + + // issue 8305 + { + in: `{"2009-11-10T23:00:00Z": "hello world"}`, + ptr: &map[time.Time]string{}, + err: &UnmarshalTypeError{"object", reflect.TypeOf(map[time.Time]string{})}, + }, } func TestMarshal(t *testing.T) { @@ -514,6 +521,7 @@ func TestUnmarshal(t *testing.T) { if tt.ptr == nil { continue } + // v = new(right-type) v := reflect.New(reflect.TypeOf(tt.ptr).Elem()) dec := NewDecoder(bytes.NewReader(in)) @@ -521,7 +529,9 @@ func TestUnmarshal(t *testing.T) { dec.UseNumber() } if err := dec.Decode(v.Interface()); !reflect.DeepEqual(err, tt.err) { - t.Errorf("#%d: %v want %v", i, err, tt.err) + t.Errorf("#%d: %v, want %v", i, err, tt.err) + continue + } else if err != nil { continue } if !reflect.DeepEqual(v.Elem().Interface(), tt.out) { |