luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle restricted characters by converting them to numeric character

Browse Source 
2007-08-08  Matthias Clasen  <mclasen@redhat.com>

        * glib/gmarkup.c (append_escaped_text): Handle restricted
        characters by converting them to numeric character
        entities.  (#464145, Andreas Monitzer)

        * tests/markup-escape-test.c: Add tests for restricted
        characters and numeric character entities.


svn path=/trunk/; revision=5684
This commit is contained in:
Matthias Clasen 2007-08-09 02:06:04 +00:00 committed by Matthias Clasen
parent c4b9053e16
commit 28f781501e
3 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-08-08 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (append_escaped_text): Handle restricted
characters by converting them to numeric character
entities. (#464145, Andreas Monitzer)
* tests/markup-escape-test.c: Add tests for restricted
characters and numeric character entities.
2007-08-08 Matthias Clasen <mclasen@redhat.com>
* glib/glib.symbols:

19
glib/gmarkup.c
View File

@ -955,7 +955,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
set_error (context,
error,
G_MARKUP_ERROR_BAD_UTF8,
_("Invalid UTF-8 encoded text"));
_("Invalid UTF-8 encoded text - overlong sequence"));
}
goto finished;
@ -983,7 +983,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
set_error (context,
error,
G_MARKUP_ERROR_BAD_UTF8,
_("Invalid UTF-8 encoded text"));
_("Invalid UTF-8 encoded text - not a start char"));
goto finished;
}
@ -1019,7 +1019,9 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
set_error (context,
error,
G_MARKUP_ERROR_BAD_UTF8,
_("Invalid UTF-8 encoded text"));
_("Invalid UTF-8 encoded text - not valid '%s'"),
g_strndup (context->current_text,
context->current_text_len));
goto finished;
}
@ -1900,6 +1902,7 @@ append_escaped_text (GString *str,
{
const gchar *p;
const gchar *end;
gunichar c;
p = text;
end = text + length;
@ -1932,7 +1935,15 @@ append_escaped_text (GString *str,
break;
default:
g_string_append_len (str, p, next - p);
c = g_utf8_get_char (p);
if ((0x1 <= c && c <= 0x8) ||
(0xb <= c && c <= 0xc) ||
(0xe <= c && c <= 0x1f) ||
(0x7f <= c && c <= 0x84) ||
(0x86 <= c && c <= 0x9f))
g_string_append_printf (str, "&#x%x;", c);
else
g_string_append_len (str, p, next - p);
break;
}

37
tests/markup-escape-test.c
View File

@ -26,6 +26,24 @@ test (const gchar *original,
g_free (result);
}
static void
test_unichar (gunichar c,
gboolean entity)
{
gint len;
gchar outbuf[7], expected[12];
len = g_unichar_to_utf8 (c, outbuf);
outbuf[len] = 0;
if (entity)
g_snprintf (expected, 12, "&#x%x;", c);
else
strcpy (expected, outbuf);
test (outbuf, expected);
}
static void
test_format (const gchar *format,
const gchar *expected,
@ -67,6 +85,25 @@ int main (int argc, char **argv)
test ("A&&", "A&amp;&amp;");
test ("A&&A", "A&amp;&amp;A");
test ("A&A&A", "A&amp;A&amp;A");
test ("A&#23;A", "A&amp;#23;A");
test ("A&#xa;A", "A&amp;#xa;A");
test_unichar (0x1, TRUE);
test_unichar (0x8, TRUE);
test_unichar (0x9, FALSE);
test_unichar (0xa, FALSE);
test_unichar (0xb, TRUE);
test_unichar (0xc, TRUE);
test_unichar (0xd, FALSE);
test_unichar (0xe, TRUE);
test_unichar (0x1f, TRUE);
test_unichar (0x20, FALSE);
test_unichar (0x7e, FALSE);
test_unichar (0x7f, TRUE);
test_unichar (0x84, TRUE);
test_unichar (0x85, FALSE);
test_unichar (0x86, TRUE);
test_unichar (0x9f, TRUE);
test_unichar (0xa0, FALSE);
/* Tests for g_markup_printf_escaped() */
test_format ("A", "A");