Changeset e6b41b1

Timestamp:

2011-10-21T03:59:14Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

de26f3c

Parents:

3864c08

Message:

Strip illegal characters in generated XML streams so Jabber servers won't
disconnect people who don't understand how to disable stupid IRC client
features. Based very loosely on a patch and discussion submitted by Artem
Savkov on bug #552.

File:

• lib/xmltree.c (modified) (2 diffs)

lib/xmltree.c

@@ -557 +557 @@
 }
 
+/* Strip a few non-printable characters that aren't allowed in XML streams
+   (and upset some XMPP servers for example). */
+void xt_strip_text( char *in )
+{
+        char *out = in;
+        static const char nonprint[32] = {
+                0, 0, 0, 0, 0, 0, 0, 0, /* 0..7 */
+                0, 1, 1, 0, 0, 1, 0, 0, /* 9 (tab), 10 (\n), 13 (\r) */
+        };
+        
+        if( !in )
+                return;
+
+        while( *in )
+        {
+                if( (unsigned int) *in >= ' ' || nonprint[(unsigned int) *in] )
+                        *out ++ = *in;
+                in ++;
+        }
+        *out = *in;
+}
+
 struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children )
 {
@@ -568 +590 @@
         if( text )
         {
-                node->text_len = strlen( text );
-                node->text = g_memdup( text, node->text_len + 1 );
+                node->text = g_strdup( text );
+                xt_strip_text( node->text );
+                node->text_len = strlen( node->text );
         }