Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions carriage_return_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package jsonquery

import (
"encoding/xml"
"io"
"strings"
"testing"
)

func TestOutputXMLPreservesCarriageReturns(t *testing.T) {
doc, err := Parse(strings.NewReader(`{"v":"a\rb\r\nc\td\ne & < >"}`))
if err != nil {
t.Fatal(err)
}
want := "a\rb\r\nc\td\ne & < >"
var got strings.Builder
d := xml.NewDecoder(strings.NewReader(doc.OutputXML()))
for {
tok, err := d.Token()
if err == io.EOF {
break
}
if err != nil {
t.Fatal(err)
}
if x, ok := tok.(xml.CharData); ok {
got.Write([]byte(x))
}
}
if got.String() != want {
t.Errorf("decoded text=%q, want%q", got.String(), want)
}
}
5 changes: 3 additions & 2 deletions node.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ func (n *Node) InnerText() string {
}

// xmlTextEscaper escapes the characters that are not allowed to appear
// literally in XML character data.
var xmlTextEscaper = strings.NewReplacer("&", "&amp;", "<", "&lt;", ">", "&gt;")
// literally in XML character data. Carriage returns must be references because
// XML parsers otherwise normalize them to line feeds.
var xmlTextEscaper = strings.NewReplacer("&", "&amp;", "<", "&lt;", ">", "&gt;", "\r", "&#13;")

func outputXML(b *strings.Builder, n *Node, level int, skip bool) {
level++
Expand Down