Modified Files: glib/ChangeLog glib/glib/giochannel.c

Modified Files:
	glib/ChangeLog glib/glib/giochannel.c

        * glib/giochannel.c: Fixed a "sense of comparison" bug,
        added an assert to check when g_io_channels_read_chars ()
        is looping endlessly due to encoded_read_buf being corrupted.

diff --git a/ChangeLog b/ChangeLog
index a353b0f35681f54c6963b1775b0986c5d34f2526..9a36dbf04df8505125f3e6c7870d8d33c445b28f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-10  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giochannel.c: Fixed a "sense of comparison" bug,
+       added an assert to check when g_io_channels_read_chars ()
+       is looping endlessly due to encoded_read_buf being corrupted.
+
 2001-08-06  Sven Neumann  <sven@gimp.org>
 
        * glib/gutils.[ch]: added new function g_nullify_pointer().

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a353b0f35681f54c6963b1775b0986c5d34f2526..9a36dbf04df8505125f3e6c7870d8d33c445b28f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-08-10  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giochannel.c: Fixed a "sense of comparison" bug,
+       added an assert to check when g_io_channels_read_chars ()
+       is looping endlessly due to encoded_read_buf being corrupted.
+
 2001-08-06  Sven Neumann  <sven@gimp.org>
 
        * glib/gutils.[ch]: added new function g_nullify_pointer().

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a353b0f35681f54c6963b1775b0986c5d34f2526..9a36dbf04df8505125f3e6c7870d8d33c445b28f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-08-10  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giochannel.c: Fixed a "sense of comparison" bug,
+       added an assert to check when g_io_channels_read_chars ()
+       is looping endlessly due to encoded_read_buf being corrupted.
+
 2001-08-06  Sven Neumann  <sven@gimp.org>
 
        * glib/gutils.[ch]: added new function g_nullify_pointer().

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a353b0f35681f54c6963b1775b0986c5d34f2526..9a36dbf04df8505125f3e6c7870d8d33c445b28f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2001-08-10  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giochannel.c: Fixed a "sense of comparison" bug,
+       added an assert to check when g_io_channels_read_chars ()
+       is looping endlessly due to encoded_read_buf being corrupted.
+
 2001-08-06  Sven Neumann  <sven@gimp.org>
 
        * glib/gutils.[ch]: added new function g_nullify_pointer().

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a353b0f35681f54c6963b1775b0986c5d34f2526..9a36dbf04df8505125f3e6c7870d8d33c445b28f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-08-10  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giochannel.c: Fixed a "sense of comparison" bug,
+       added an assert to check when g_io_channels_read_chars ()
+       is looping endlessly due to encoded_read_buf being corrupted.
+
 2001-08-06  Sven Neumann  <sven@gimp.org>
 
        * glib/gutils.[ch]: added new function g_nullify_pointer().

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a353b0f35681f54c6963b1775b0986c5d34f2526..9a36dbf04df8505125f3e6c7870d8d33c445b28f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-08-10  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giochannel.c: Fixed a "sense of comparison" bug,
+       added an assert to check when g_io_channels_read_chars ()
+       is looping endlessly due to encoded_read_buf being corrupted.
+
 2001-08-06  Sven Neumann  <sven@gimp.org>
 
        * glib/gutils.[ch]: added new function g_nullify_pointer().

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a353b0f35681f54c6963b1775b0986c5d34f2526..9a36dbf04df8505125f3e6c7870d8d33c445b28f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-08-10  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giochannel.c: Fixed a "sense of comparison" bug,
+       added an assert to check when g_io_channels_read_chars ()
+       is looping endlessly due to encoded_read_buf being corrupted.
+
 2001-08-06  Sven Neumann  <sven@gimp.org>
 
        * glib/gutils.[ch]: added new function g_nullify_pointer().

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a353b0f35681f54c6963b1775b0986c5d34f2526..9a36dbf04df8505125f3e6c7870d8d33c445b28f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-08-10  Ron Steinke  <rsteinke@w-link.net>
+
+       * glib/giochannel.c: Fixed a "sense of comparison" bug,
+       added an assert to check when g_io_channels_read_chars ()
+       is looping endlessly due to encoded_read_buf being corrupted.
+
 2001-08-06  Sven Neumann  <sven@gimp.org>
 
        * glib/gutils.[ch]: added new function g_nullify_pointer().

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 545ef24fc4b99dbd302da2b251f15c25fcbd57fa..9d747f1ae55f2b793e8091e2ae772e5950831a4a 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -1207,7 +1207,7 @@ reencode:
                 lastchar = nextchar;
                 break;
               case -1:
-                if (oldlen > channel->encoded_read_buf->len)
+                if (oldlen < channel->encoded_read_buf->len)
                   status = G_IO_STATUS_NORMAL;
                 else
                   {
@@ -1677,6 +1677,7 @@ g_io_channel_read_chars (GIOChannel       *channel,
         {
           prevchar = nextchar;
           nextchar = g_utf8_next_char (nextchar);
+          g_assert (nextchar != prevchar); /* Posibile for *prevchar of -1 or -2 */
         }
       while (nextchar < channel->encoded_read_buf->str + got_bytes);