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


svn path=/trunk/; revision=7326
This commit is contained in:
Ryan Lortie 2008-08-08 16:41:30 +00:00 committed by Ryan Lortie
parent 82f550106a
commit 4958c5cd4e
2 changed files with 12 additions and 7 deletions

View File

@ -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

View File

@ -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));