Commit 5eaddd21 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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

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
parent 5ae803a4
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>
* glib/gbase64.c: Add NULL checks to the base64
......
......@@ -1000,16 +1000,21 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
&first_invalid))
{
gint newlines = 0;
const gchar *p;
p = context->current_text;
while (p != context->current_text_end)
const gchar *p, *q;
q = p = context->current_text;
while (p != first_invalid)
{
if (*p == '\n')
++newlines;
{
++newlines;
q = p + 1;
context->char_number = 1;
}
++p;
}
context->line_number += newlines;
context->char_number += g_utf8_strlen (q, first_invalid - q);
set_error (context,
error,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment