From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 8 Oct 2014 19:56:11 +0000 (-0400)
Subject: util.stanza: Escape newlines and tabs (\r\n\t) when serializing stanzas. \r\n transfo... 
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=8420ce79fe0c78fb6a99793f4c925d178f4004ee;hp=4b39eb72b97e9827e5322974f0424c3fc063ce25;p=prosody.git

util.stanza: Escape newlines and tabs (\r\n\t) when serializing stanzas. \r\n transforms into \n  otherwise, and \r\n\t in attributes transforms into spaces.
---

diff --git a/util/stanza.lua b/util/stanza.lua
index 7c214210..2fcf2c79 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -202,8 +202,19 @@ end
 
 local xml_escape
 do
-	local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
-	function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
+	local escape_table = {
+		["'"] = "&apos;";
+		['"'] = "&quot;";
+		["<"] = "&lt;";
+		[">"] = "&gt;";
+		["&"] = "&amp;";
+		-- escape this whitespace because [\r\n\t] change into spaces in attributes
+		-- and \r\n changes into \n in text, and we want to preserve original bytes
+		["\t"] = "&#x9;";
+		["\n"] = "&#xA;";
+		["\r"] = "&#xD;";
+	};
+	function xml_escape(str) return (s_gsub(str, "['&<>\"\t\n\r]", escape_table)); end
 	_M.xml_escape = xml_escape;
 end