Escape entities just before Pango rendering (#2382).v2.16.35

Previously, text coming out of the player would have things like
& escaped to &.  This escaping is also done by libxml++ when
writing XML, so doing it in the player would mean it was done
twice.

We do, however, need to escape things before passing them to Pango
as otherwise it gives errors and renders nothing for the line.

Here we move the escaping to just before the rendering, meaning
that in the reset of DoM we should pass unescaped strings around.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc
index d3db4ac19..2338bde97 100644
--- a/src/lib/render_text.cc
+++ b/src/lib/render_text.cc
@@ -103,6 +103,11 @@ marked_up (list<StringText> subtitles, int target_height, float fade_factor, str
 			span += " " + extra_attribute;
 		}
 		span += ">";
+
+		boost::algorithm::replace_all(text, "&", "&amp;");
+		boost::algorithm::replace_all(text, "<", "&lt;");
+		boost::algorithm::replace_all(text, ">", "&gt;");
+
 		span += text;
 		span += "</span>";
 		return span;