From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 8 Aug 2008 16:41:30 +0000 (+0000)
Subject: Bug 546876 - Modify GMarkup parser to accept &#x1; .. &#x1f;
X-Git-Tag: GLIB_2_17_7~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4958c5cd4e297a1ac71f7add2ad504855c5e5cda;p=platform%2Fupstream%2Fglib.git

Bug 546876 - Modify GMarkup parser to accept &#x1; .. &#x1f;

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;.


svn path=/trunk/; revision=7326
---

diff --git a/ChangeLog b/ChangeLog
index 1b2603def..6650f5f9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-08  Ryan Lortie  <desrt@desrt.ca>
+
+	Bug 546876 - Modify GMarkup parser to accept &#x1; .. &#x1f;
+
+	* 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;.
+
 2008-08-07  Tor Lillqvist  <tml@novell.com>
 
 	* configure.in: Output comment clarifying GPid semantics to
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 05cecd549..cfea02568 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -634,13 +634,10 @@ unescape_text_state_after_charref_hash (UnescapeContext *ucontext,
             }
           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));