From 5877048749520ca415df855160edde9213e806db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <f@miniflux.net>
Date: Sat, 20 Mar 2021 20:38:29 -0700
Subject: [PATCH] Improve handling of Atom text content with CDATA

---
 reader/atom/atom_10.go      | 8 +++++---
 reader/atom/atom_10_test.go | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/reader/atom/atom_10.go b/reader/atom/atom_10.go
index 8718dca1..f31d89fa 100644
--- a/reader/atom/atom_10.go
+++ b/reader/atom/atom_10.go
@@ -231,10 +231,12 @@ func (a *atom10Text) String() string {
 	var content string
 
 	switch {
-	case strings.HasPrefix(a.InnerXML, `<![CDATA[`):
-		content = a.CharData
 	case a.Type == "", a.Type == "text", a.Type == "text/plain":
-		content = a.InnerXML
+		if strings.HasPrefix(a.InnerXML, `<![CDATA[`) {
+			content = html.EscapeString(a.CharData)
+		} else {
+			content = a.InnerXML
+		}
 	case a.Type == "xhtml":
 		if a.XHTMLRootElement.InnerXML != "" {
 			content = a.XHTMLRootElement.InnerXML
diff --git a/reader/atom/atom_10_test.go b/reader/atom/atom_10_test.go
index 4e82d224..f08b8040 100644
--- a/reader/atom/atom_10_test.go
+++ b/reader/atom/atom_10_test.go
@@ -531,7 +531,7 @@ func TestParseEntryWithTextSummary(t *testing.T) {
 		<link href="http://example.org/d"/>
 		<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
 		<updated>2003-12-13T18:30:02Z</updated>
-		<summary type="text"><![CDATA[AT&amp;T &lt;S&gt;]]></summary>
+		<summary type="text"><![CDATA[AT&T <S>]]></summary>
 	  </entry>
 	</feed>`
 
@@ -583,7 +583,7 @@ func TestParseEntryWithTextContent(t *testing.T) {
 		<link href="http://example.org/d"/>
 		<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
 		<updated>2003-12-13T18:30:02Z</updated>
-		<content><![CDATA[AT&amp;T &lt;S&gt;]]></content>
+		<content><![CDATA[AT&T <S>]]></content>
 	  </entry>
 
 	</feed>`