luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-20 12:32:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Report more accurate position for invalid UTF-8. (#350802, Simon Budig)

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

        * glib/gmarkup.c (g_markup_parse_context_parse): Report
        more accurate position for invalid UTF-8.  (#350802,
        Simon Budig)



svn path=/trunk/; revision=5373
This commit is contained in:
Matthias Clasen 2007-03-06 07:12:50 +00:00 committed by Matthias Clasen
parent 5ae803a47f
commit 5eaddd21bb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-03-06 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_parse_context_parse): Report
more accurate position for invalid UTF-8. (#350802,
Simon Budig)
2007-03-06 Matthias Clasen <mclasen@redhat.com> 2007-03-06 Matthias Clasen <mclasen@redhat.com>
* glib/gbase64.c: Add NULL checks to the base64 * glib/gbase64.c: Add NULL checks to the base64

11
glib/gmarkup.c
View File

@ -1000,16 +1000,21 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
&first_invalid)) &first_invalid))
{ {
gint newlines = 0; gint newlines = 0;
const gchar *p; const gchar *p, *q;
p = context->current_text; q = p = context->current_text;
while (p != context->current_text_end) while (p != first_invalid)
{ {
if (*p == '\n') if (*p == '\n')
{
++newlines; ++newlines;
q = p + 1;
context->char_number = 1;
}
++p; ++p;
} }
context->line_number += newlines; context->line_number += newlines;
context->char_number += g_utf8_strlen (q, first_invalid - q);
set_error (context, set_error (context,
error, error,