In order to avoid infinite loops on invalid UTF-8 strings, change the skip

2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
* glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops on invalid UTF-8 strings, change the skip count for 0xfe and 0xff from 0 to 1.

diff --git a/ChangeLog b/ChangeLog
index 3c19d1774d9caf381fac941c2889e455a89c563f..dc0a824ffaee82b0db0bfd7f31b27d3771910dd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops
+       on invalid UTF-8 strings, change the skip count for 0xfe and 0xff
+       from 0 to 1.
+
 2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3c19d1774d9caf381fac941c2889e455a89c563f..dc0a824ffaee82b0db0bfd7f31b27d3771910dd6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops
+       on invalid UTF-8 strings, change the skip count for 0xfe and 0xff
+       from 0 to 1.
+
 2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3c19d1774d9caf381fac941c2889e455a89c563f..dc0a824ffaee82b0db0bfd7f31b27d3771910dd6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops
+       on invalid UTF-8 strings, change the skip count for 0xfe and 0xff
+       from 0 to 1.
+
 2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3c19d1774d9caf381fac941c2889e455a89c563f..dc0a824ffaee82b0db0bfd7f31b27d3771910dd6 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops
+       on invalid UTF-8 strings, change the skip count for 0xfe and 0xff
+       from 0 to 1.
+
 2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3c19d1774d9caf381fac941c2889e455a89c563f..dc0a824ffaee82b0db0bfd7f31b27d3771910dd6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops
+       on invalid UTF-8 strings, change the skip count for 0xfe and 0xff
+       from 0 to 1.
+
 2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3c19d1774d9caf381fac941c2889e455a89c563f..dc0a824ffaee82b0db0bfd7f31b27d3771910dd6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops
+       on invalid UTF-8 strings, change the skip count for 0xfe and 0xff
+       from 0 to 1.
+
 2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3c19d1774d9caf381fac941c2889e455a89c563f..dc0a824ffaee82b0db0bfd7f31b27d3771910dd6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops
+       on invalid UTF-8 strings, change the skip count for 0xfe and 0xff
+       from 0 to 1.
+
 2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3c19d1774d9caf381fac941c2889e455a89c563f..dc0a824ffaee82b0db0bfd7f31b27d3771910dd6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-11-28  Daniel Elstner  <daniel.elstner@gmx.net>
+
+       * glib/gutf8.c (utf8_skip_data): In order to avoid infinite loops
+       on invalid UTF-8 strings, change the skip count for 0xfe and 0xff
+       from 0 to 1.
+
 2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes

diff --git a/glib/gutf8.c b/glib/gutf8.c
index 2aedfdc97f4b5a3ae16e6e1ab68775e51493cde1..3ec10a703075e1fdabb0c3328c30f01cf4131212 100644 (file)
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -109,7 +109,7 @@ static const gchar utf8_skip_data[256] = {
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
   2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-  3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0
+  3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
 };
 
 const gchar * const g_utf8_skip = utf8_skip_data;