Fix read past end of the string. (#50404, fix from Jonas Borgström)

Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>

	* gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
	(#50404, fix from Jonas Borgström)

diff --git a/ChangeLog b/ChangeLog
index e5567581f4749ce3acd9538faf936db1516f212f..f12a6e696915f6215d582517a5cb9a100627d2db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
+       (#50404, fix from Jonas Borgström)
+       
 Sun Apr 29 00:37:34 2001  Tim Janik  <timj@gtk.org>
 
        * ghook.[hc]: made hook ids a gulong.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e5567581f4749ce3acd9538faf936db1516f212f..f12a6e696915f6215d582517a5cb9a100627d2db 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
+       (#50404, fix from Jonas Borgström)
+       
 Sun Apr 29 00:37:34 2001  Tim Janik  <timj@gtk.org>
 
        * ghook.[hc]: made hook ids a gulong.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e5567581f4749ce3acd9538faf936db1516f212f..f12a6e696915f6215d582517a5cb9a100627d2db 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
+       (#50404, fix from Jonas Borgström)
+       
 Sun Apr 29 00:37:34 2001  Tim Janik  <timj@gtk.org>
 
        * ghook.[hc]: made hook ids a gulong.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e5567581f4749ce3acd9538faf936db1516f212f..f12a6e696915f6215d582517a5cb9a100627d2db 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
+       (#50404, fix from Jonas Borgström)
+       
 Sun Apr 29 00:37:34 2001  Tim Janik  <timj@gtk.org>
 
        * ghook.[hc]: made hook ids a gulong.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e5567581f4749ce3acd9538faf936db1516f212f..f12a6e696915f6215d582517a5cb9a100627d2db 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
+       (#50404, fix from Jonas Borgström)
+       
 Sun Apr 29 00:37:34 2001  Tim Janik  <timj@gtk.org>
 
        * ghook.[hc]: made hook ids a gulong.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e5567581f4749ce3acd9538faf936db1516f212f..f12a6e696915f6215d582517a5cb9a100627d2db 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
+       (#50404, fix from Jonas Borgström)
+       
 Sun Apr 29 00:37:34 2001  Tim Janik  <timj@gtk.org>
 
        * ghook.[hc]: made hook ids a gulong.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e5567581f4749ce3acd9538faf936db1516f212f..f12a6e696915f6215d582517a5cb9a100627d2db 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
+       (#50404, fix from Jonas Borgström)
+       
 Sun Apr 29 00:37:34 2001  Tim Janik  <timj@gtk.org>
 
        * ghook.[hc]: made hook ids a gulong.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e5567581f4749ce3acd9538faf936db1516f212f..f12a6e696915f6215d582517a5cb9a100627d2db 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed May  2 11:10:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_to_ucs4_fast): Fix read past end of the string.
+       (#50404, fix from Jonas Borgström)
+       
 Sun Apr 29 00:37:34 2001  Tim Janik  <timj@gtk.org>
 
        * ghook.[hc]: made hook ids a gulong.

diff --git a/glib/gutf8.c b/glib/gutf8.c
index 1e1123898a2a64b51ed59ea6f4f54981f7356cd0..541b1826eb114918c670561dcb83065098fb3803 100644 (file)
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -660,7 +660,7 @@ g_utf8_to_ucs4_fast (const gchar *str,
     }
   else
     {
-      while (*p && p < str + len)
+      while (p < str + len && *p)
        {
          p = g_utf8_next_char (p);
          ++n_chars;

diff --git a/gutf8.c b/gutf8.c
index 1e1123898a2a64b51ed59ea6f4f54981f7356cd0..541b1826eb114918c670561dcb83065098fb3803 100644 (file)
--- a/gutf8.c
+++ b/gutf8.c
@@ -660,7 +660,7 @@ g_utf8_to_ucs4_fast (const gchar *str,
     }
   else
     {
-      while (*p && p < str + len)
+      while (p < str + len && *p)
        {
          p = g_utf8_next_char (p);
          ++n_chars;