Handle a long stream of bytes containing no UTF-8 character starts

2000-11-11  Havoc Pennington  <hp@pobox.com>

* gmarkup.c (g_markup_parse_context_parse): Handle a long stream
of bytes containing no UTF-8 character starts

diff --git a/ChangeLog b/ChangeLog
index df10217..0b6cae3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-11  Havoc Pennington  <hp@pobox.com>
+
+       * gmarkup.c (g_markup_parse_context_parse): Handle a long stream
+       of bytes containing no UTF-8 character starts
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add missing entry points.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index df10217..0b6cae3 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2000-11-11  Havoc Pennington  <hp@pobox.com>
+
+       * gmarkup.c (g_markup_parse_context_parse): Handle a long stream
+       of bytes containing no UTF-8 character starts
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add missing entry points.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index df10217..0b6cae3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2000-11-11  Havoc Pennington  <hp@pobox.com>
+
+       * gmarkup.c (g_markup_parse_context_parse): Handle a long stream
+       of bytes containing no UTF-8 character starts
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add missing entry points.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index df10217..0b6cae3 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2000-11-11  Havoc Pennington  <hp@pobox.com>
+
+       * gmarkup.c (g_markup_parse_context_parse): Handle a long stream
+       of bytes containing no UTF-8 character starts
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add missing entry points.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index df10217..0b6cae3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2000-11-11  Havoc Pennington  <hp@pobox.com>
+
+       * gmarkup.c (g_markup_parse_context_parse): Handle a long stream
+       of bytes containing no UTF-8 character starts
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add missing entry points.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index df10217..0b6cae3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2000-11-11  Havoc Pennington  <hp@pobox.com>
+
+       * gmarkup.c (g_markup_parse_context_parse): Handle a long stream
+       of bytes containing no UTF-8 character starts
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add missing entry points.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index df10217..0b6cae3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2000-11-11  Havoc Pennington  <hp@pobox.com>
+
+       * gmarkup.c (g_markup_parse_context_parse): Handle a long stream
+       of bytes containing no UTF-8 character starts
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add missing entry points.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index df10217..0b6cae3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2000-11-11  Havoc Pennington  <hp@pobox.com>
+
+       * gmarkup.c (g_markup_parse_context_parse): Handle a long stream
+       of bytes containing no UTF-8 character starts
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add missing entry points.

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index e955f7c..3df39b9 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -889,6 +889,17 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
           g_string_append_len (context->leftover_char_portion,
                                text, text_len);
 
+          if (context->leftover_char_portion->len > 7)
+            {
+              /* The leftover char portion is too big to be
+               * a UTF-8 character
+               */
+              set_error (context,
+                         error,
+                         G_MARKUP_ERROR_BAD_UTF8,
+                         _("Invalid UTF-8 encoded text"));
+            }
+          
           goto finished;
         }
     }

diff --git a/gmarkup.c b/gmarkup.c
index e955f7c..3df39b9 100644 (file)
--- a/gmarkup.c
+++ b/gmarkup.c
@@ -889,6 +889,17 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
           g_string_append_len (context->leftover_char_portion,
                                text, text_len);
 
+          if (context->leftover_char_portion->len > 7)
+            {
+              /* The leftover char portion is too big to be
+               * a UTF-8 character
+               */
+              set_error (context,
+                         error,
+                         G_MARKUP_ERROR_BAD_UTF8,
+                         _("Invalid UTF-8 encoded text"));
+            }
+          
           goto finished;
         }
     }