From: Murray Cumming Date: Tue, 11 Mar 2008 15:43:25 +0000 (+0000) Subject: Bug 521591 – g_markup_parse_context_parse() creates GError message that X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0ae78c829dfc7fdf6a88236846bd421ef379f3f3;p=dana%2Fcg-glib.git Bug 521591 – g_markup_parse_context_parse() creates GError message that 2008-03-11 Murray Cumming Bug 521591 – g_markup_parse_context_parse() creates GError message that is invalid UTF8. * glib/gmarkup.c (set_error): Make sure that the GError::message is valid UTF-8 even if it is complaining about invalid UTF-8 in the markup text, using _g_utf8_make_valid(). svn path=/trunk/; revision=6680 --- diff --git a/ChangeLog b/ChangeLog index 05b1464d..61b0ecad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-03-11 Murray Cumming + + Bug 521591 – g_markup_parse_context_parse() creates GError message that + is invalid UTF8. + + * glib/gmarkup.c (set_error): Make sure that the GError::message is + valid UTF-8 even if it is complaining about invalid UTF-8 in the + markup text, using _g_utf8_make_valid(). + 2008-03-10 Matthias Clasen * === Released 2.16.1 === diff --git a/glib/gmarkup.c b/glib/gmarkup.c index e1e9aa57..f3e8c1f4 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -215,14 +215,20 @@ set_error (GMarkupParseContext *context, { GError *tmp_error; gchar *s; + gchar *s_valid; va_list args; va_start (args, format); s = g_strdup_vprintf (format, args); va_end (args); - tmp_error = g_error_new_literal (G_MARKUP_ERROR, code, s); + /* Make sure that the GError message is valid UTF-8 even if it is + * complaining about invalid UTF-8 in the markup: */ + s_valid = _g_utf8_make_valid (s); + tmp_error = g_error_new_literal (G_MARKUP_ERROR, code, s_valid); + g_free (s); + g_free (s_valid); g_prefix_error (&tmp_error, _("Error on line %d char %d: "),