glib r7326 - in trunk: . glib

[ryanl svn gnome org]

Author: ryanl
Date: Fri Aug  8 16:41:30 2008
New Revision: 7326
URL: http://svn.gnome.org/viewvc/glib?rev=7326&view=rev

Log:
Bug 546876 - Modify GMarkup parser to accept  .. 

2008-08-08  Ryan Lortie  <desrt desrt ca>

        * glib/gmarkup.c: previously the parser only accepted character
        references for \t \n and \r (as per XML 1.0); now it accepts all
        of &#x1; .. &#x1f;.



Modified:
   trunk/ChangeLog
   trunk/glib/gmarkup.c

Modified: trunk/glib/gmarkup.c
==============================================================================
--- trunk/glib/gmarkup.c	(original)
+++ trunk/glib/gmarkup.c	Fri Aug  8 16:41:30 2008
@@ -634,13 +634,10 @@
             }
           else
             {
-              /* characters XML permits */
-              if (l == 0x9 ||
-                  l == 0xA ||
-                  l == 0xD ||
-                  (l >= 0x20 && l <= 0xD7FF) ||
-                  (l >= 0xE000 && l <= 0xFFFD) ||
-                  (l >= 0x10000 && l <= 0x10FFFF))
+              /* characters XML 1.1 permits */
+              if ((0 < l && l <= 0xD7FF) ||
+                  (0xE000 <= l && l <= 0xFFFD) ||
+                  (0x10000 <= l && l <= 0x10FFFF))
                 {
                   gchar buf[8];
                   g_string_append (ucontext->str, char_str (l, buf));