luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 10:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Ron Steinke 2001-08-10 14:56:37 +00:00
parent b1d72f582b
commit 6132f0496a
9 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2001-08-06 Sven Neumann <sven@gimp.org>
* glib/gutils.[ch]: added new function g_nullify_pointer(). * glib/gutils.[ch]: added new function g_nullify_pointer().

6
ChangeLog.pre-2-0
View File

@ -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> 2001-08-06 Sven Neumann <sven@gimp.org>
* glib/gutils.[ch]: added new function g_nullify_pointer(). * glib/gutils.[ch]: added new function g_nullify_pointer().

6
ChangeLog.pre-2-10
View File

@ -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> 2001-08-06 Sven Neumann <sven@gimp.org>
* glib/gutils.[ch]: added new function g_nullify_pointer(). * glib/gutils.[ch]: added new function g_nullify_pointer().

6
ChangeLog.pre-2-12
View File

@ -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> 2001-08-06 Sven Neumann <sven@gimp.org>
* glib/gutils.[ch]: added new function g_nullify_pointer(). * glib/gutils.[ch]: added new function g_nullify_pointer().

6
ChangeLog.pre-2-2
View File

@ -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> 2001-08-06 Sven Neumann <sven@gimp.org>
* glib/gutils.[ch]: added new function g_nullify_pointer(). * glib/gutils.[ch]: added new function g_nullify_pointer().

6
ChangeLog.pre-2-4
View File

@ -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> 2001-08-06 Sven Neumann <sven@gimp.org>
* glib/gutils.[ch]: added new function g_nullify_pointer(). * glib/gutils.[ch]: added new function g_nullify_pointer().

6
ChangeLog.pre-2-6
View File

@ -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> 2001-08-06 Sven Neumann <sven@gimp.org>
* glib/gutils.[ch]: added new function g_nullify_pointer(). * glib/gutils.[ch]: added new function g_nullify_pointer().

6
ChangeLog.pre-2-8
View File

@ -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> 2001-08-06 Sven Neumann <sven@gimp.org>
* glib/gutils.[ch]: added new function g_nullify_pointer(). * glib/gutils.[ch]: added new function g_nullify_pointer().

3
glib/giochannel.c
View File

@ -1207,7 +1207,7 @@ reencode:
lastchar = nextchar; lastchar = nextchar;
break; break;
case -1: case -1:
if (oldlen > channel->encoded_read_buf->len) if (oldlen < channel->encoded_read_buf->len)
status = G_IO_STATUS_NORMAL; status = G_IO_STATUS_NORMAL;
else else
{ {
@ -1677,6 +1677,7 @@ g_io_channel_read_chars (GIOChannel *channel,
{ {
prevchar = nextchar; prevchar = nextchar;
nextchar = g_utf8_next_char (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); while (nextchar < channel->encoded_read_buf->str + got_bytes);