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

Fix an off-by-one error in g_markup_parse_context_parse(). (#142794,

Browse Source 
Tue Jun  1 21:56:31 2004  Matthias Clasen  <maclas@gmx.de>

	* glib/gmarkup.c (advance_char): Fix an off-by-one error
	in g_markup_parse_context_parse().  (#142794, Morten Welinder)
This commit is contained in:
Matthias Clasen 2004-06-02 02:02:31 +00:00 committed by Matthias Clasen
parent 1cbaf8d913
commit dfce076fe4
6 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jun 1 22:01:40 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (advance_char): Fix an off-by-one error
in g_markup_parse_context_parse(). (#142794, Morten Welinder)
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de> Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4: Merged from 2.4:

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Tue Jun 1 22:01:40 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (advance_char): Fix an off-by-one error
in g_markup_parse_context_parse(). (#142794, Morten Welinder)
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de> Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4: Merged from 2.4:

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
Tue Jun 1 22:01:40 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (advance_char): Fix an off-by-one error
in g_markup_parse_context_parse(). (#142794, Morten Welinder)
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de> Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4: Merged from 2.4:

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Tue Jun 1 22:01:40 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (advance_char): Fix an off-by-one error
in g_markup_parse_context_parse(). (#142794, Morten Welinder)
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de> Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4: Merged from 2.4:

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Tue Jun 1 22:01:40 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (advance_char): Fix an off-by-one error
in g_markup_parse_context_parse(). (#142794, Morten Welinder)
Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de> Sun May 16 23:23:29 2004 Matthias Clasen <maclas@gmx.de>
Merged from 2.4: Merged from 2.4:

7
glib/gmarkup.c
View File

@ -662,16 +662,21 @@ unescape_text (GMarkupParseContext *context,
static gboolean static gboolean
advance_char (GMarkupParseContext *context) advance_char (GMarkupParseContext *context)
{ {
g_return_val_if_fail (context->iter != context->current_text_end, FALSE);
context->iter = g_utf8_next_char (context->iter); context->iter = g_utf8_next_char (context->iter);
context->char_number += 1; context->char_number += 1;
if (context->iter == context->current_text_end)
return FALSE;
if (*context->iter == '\n') if (*context->iter == '\n')
{ {
context->line_number += 1; context->line_number += 1;
context->char_number = 1; context->char_number = 1;
} }
return context->iter != context->current_text_end; return TRUE;
} }
static gboolean static gboolean