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

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)

diff --git a/ChangeLog b/ChangeLog
index 569c6ce..2cbb744 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
         Merged from 2.4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 569c6ce..2cbb744 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
         Merged from 2.4:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 569c6ce..2cbb744 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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>
 
         Merged from 2.4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 569c6ce..2cbb744 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
         Merged from 2.4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 569c6ce..2cbb744 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
         Merged from 2.4:

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index f509030..c820f9a 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -662,16 +662,21 @@ unescape_text (GMarkupParseContext *context,
 static gboolean
 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->char_number += 1;
+
+  if (context->iter == context->current_text_end)
+    return FALSE;
+
   if (*context->iter == '\n')
     {
       context->line_number += 1;
       context->char_number = 1;
     }
 
-  return context->iter != context->current_text_end;
+  return TRUE;
 }
 
 static gboolean