From 819a719f62d6d9583d55b1c5ac787c7f64a03de6 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@svn.gnome.org>
Date: Sun, 28 Jan 2007 20:06:12 +0000
Subject: Make sure we don't write characters < 0x20 (except 0x9, 0xa, 0xd) to
 XML.

2007-01-28  Christian Persch  <chpe@svn.gnome.org>

	* lib/ephy-node.c: (safe_write_string), (ephy_node_write_to_xml):
	* src/bookmarks/ephy-bookmarks-export.c: (sanitise_string),
	(write_topics_list), (write_rdf):

	Make sure we don't write characters < 0x20 (except 0x9, 0xa, 0xd) to
	XML. Bug #392782.

svn path=/trunk/; revision=6856
---
 lib/ephy-node.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 5581d3322..7078f23b1 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -806,6 +806,38 @@ write_parent (guint id,
 	if (data->ret < 0) return;
 }
 
+static inline int
+safe_write_string (xmlTextWriterPtr writer,
+		   const xmlChar *string)
+{
+	int ret;
+	xmlChar *copy, *p;
+
+	if (!string)
+		return 0;
+
+	/* http://www.w3.org/TR/REC-xml/#sec-well-formed :
+	   Character Range
+	   [2]     Char       ::=          #x9 | #xA | #xD | [#x20-#xD7FF] |
+	   [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+	   any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
+	*/
+
+	copy = xmlStrdup (string);
+	for (p = copy; *p; p++)
+	{
+		xmlChar c = *p;
+		if (G_UNLIKELY (c < 0x20 && c != 0xd && c != 0xa && c != 0x9)) {
+			*p = 0x20;
+		}
+	}
+
+	ret = xmlTextWriterWriteString (writer, copy);
+	xmlFree (copy);
+
+	return ret;
+}
+
 int
 ephy_node_write_to_xml(EphyNode *node,
 		       xmlTextWriterPtr writer)
@@ -851,7 +883,7 @@ ephy_node_write_to_xml(EphyNode *node,
 		switch (G_VALUE_TYPE (value))
 		{
 		case G_TYPE_STRING:
-			ret = xmlTextWriterWriteString
+			ret = safe_write_string
 				(writer, (const xmlChar *)g_value_get_string (value));
 			break;
 		case G_TYPE_BOOLEAN:
-- 
cgit