diff options
-rw-r--r-- | src/encoding/xml/marshal_test.go | 7 | ||||
-rw-r--r-- | src/encoding/xml/read.go | 3 | ||||
-rw-r--r-- | src/encoding/xml/xml_test.go | 34 |
3 files changed, 41 insertions, 3 deletions
diff --git a/src/encoding/xml/marshal_test.go b/src/encoding/xml/marshal_test.go index 5ec7ececa4..0126146d33 100644 --- a/src/encoding/xml/marshal_test.go +++ b/src/encoding/xml/marshal_test.go @@ -2428,7 +2428,10 @@ func TestIssue16158(t *testing.T) { err := Unmarshal([]byte(data), &struct { B byte `xml:"b,attr,omitempty"` }{}) - if err == nil { - t.Errorf("Unmarshal: expected error, got nil") + + // For Go 1.8.1 we've restored the old "no errors reported" behavior. + // We'll try again in Go 1.9 to report errors. + if err != nil { + t.Errorf("Unmarshal: expected nil, got error") } } diff --git a/src/encoding/xml/read.go b/src/encoding/xml/read.go index 5a89d5f504..799b57e9d1 100644 --- a/src/encoding/xml/read.go +++ b/src/encoding/xml/read.go @@ -285,7 +285,8 @@ func (p *Decoder) unmarshalAttr(val reflect.Value, attr Attr) error { return nil } - return copyValue(val, []byte(attr.Value)) + copyValue(val, []byte(attr.Value)) + return nil } var ( diff --git a/src/encoding/xml/xml_test.go b/src/encoding/xml/xml_test.go index dad6ed98c1..f43a5e7eeb 100644 --- a/src/encoding/xml/xml_test.go +++ b/src/encoding/xml/xml_test.go @@ -797,3 +797,37 @@ func TestIssue12417(t *testing.T) { } } } + +func TestIssue19333(t *testing.T) { + type X struct { + XMLName Name `xml:"X"` + A int `xml:",attr"` + C int + } + + var tests = []struct { + input string + ok bool + }{ + {`<X></X>`, true}, + {`<X A=""></X>`, true}, + {`<X A="bad"></X>`, true}, + {`<X></X>`, true}, + {`<X><C></C></X>`, false}, + {`<X><C/></X>`, false}, + {`<X><C>bad</C></X>`, false}, + } + + for _, tt := range tests { + err := Unmarshal([]byte(tt.input), new(X)) + if tt.ok { + if err != nil { + t.Errorf("%s: unexpected error: %v", tt.input, err) + } + } else { + if err == nil { + t.Errorf("%s: unexpected success", tt.input) + } + } + } +} |