diff --git a/src/encoding/xml/xml.go b/src/encoding/xml/xml.go
index 0fe323f7c8..951676d403 100644
--- a/src/encoding/xml/xml.go
+++ b/src/encoding/xml/xml.go
@@ -1004,8 +1004,9 @@ Input:
}
// .
- // It is an error for ]]> to appear in ordinary text.
- if b0 == ']' && b1 == ']' && b == '>' {
+ // It is an error for ]]> to appear in ordinary text,
+ // but it is allowed in quoted strings.
+ if quote < 0 && b0 == ']' && b1 == ']' && b == '>' {
if cdata {
trunc = 2
break Input
diff --git a/src/encoding/xml/xml_test.go b/src/encoding/xml/xml_test.go
index b2a06a7639..fc3c15eff1 100644
--- a/src/encoding/xml/xml_test.go
+++ b/src/encoding/xml/xml_test.go
@@ -626,6 +626,30 @@ type item struct {
FieldA string
}
+func TestIssue68387(t *testing.T) {
+ data := ` `
+ dec := NewDecoder(strings.NewReader(data))
+ var tok1, tok2, tok3 Token
+ var err error
+ if tok1, err = dec.RawToken(); err != nil {
+ t.Fatalf("RawToken() failed: %v", err)
+ }
+ if tok2, err = dec.RawToken(); err != nil {
+ t.Fatalf("RawToken() failed: %v", err)
+ }
+ if tok3, err = dec.RawToken(); err != io.EOF || tok3 != nil {
+ t.Fatalf("Missed EOF")
+ }
+ s := StartElement{Name{"", "item"}, []Attr{Attr{Name{"","b"}, "]]>"}}}
+ if !reflect.DeepEqual(tok1.(StartElement), s) {
+ t.Error("Wrong start element")
+ }
+ e := EndElement{Name{"","item"}}
+ if tok2.(EndElement) != e {
+ t.Error("Wrong end element")
+ }
+}
+
func TestIssue569(t *testing.T) {
data := `- abcd
`
var i item