diff --git a/ChangeLog b/ChangeLog index d8ec0ef04..d35f1a81e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri May 30 15:51:43 2003 Owen Taylor + + * glib/giochannel.c (g_io_error_get_from_g_error): + Do a g_return_val_if_fail() on err == NULL to be a + bit more robuts on buggy IO channel implementations. + (#113396, Dan Winship) + Tue May 27 19:56:35 2003 Owen Taylor * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d8ec0ef04..d35f1a81e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Fri May 30 15:51:43 2003 Owen Taylor + + * glib/giochannel.c (g_io_error_get_from_g_error): + Do a g_return_val_if_fail() on err == NULL to be a + bit more robuts on buggy IO channel implementations. + (#113396, Dan Winship) + Tue May 27 19:56:35 2003 Owen Taylor * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index d8ec0ef04..d35f1a81e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Fri May 30 15:51:43 2003 Owen Taylor + + * glib/giochannel.c (g_io_error_get_from_g_error): + Do a g_return_val_if_fail() on err == NULL to be a + bit more robuts on buggy IO channel implementations. + (#113396, Dan Winship) + Tue May 27 19:56:35 2003 Owen Taylor * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d8ec0ef04..d35f1a81e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Fri May 30 15:51:43 2003 Owen Taylor + + * glib/giochannel.c (g_io_error_get_from_g_error): + Do a g_return_val_if_fail() on err == NULL to be a + bit more robuts on buggy IO channel implementations. + (#113396, Dan Winship) + Tue May 27 19:56:35 2003 Owen Taylor * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d8ec0ef04..d35f1a81e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Fri May 30 15:51:43 2003 Owen Taylor + + * glib/giochannel.c (g_io_error_get_from_g_error): + Do a g_return_val_if_fail() on err == NULL to be a + bit more robuts on buggy IO channel implementations. + (#113396, Dan Winship) + Tue May 27 19:56:35 2003 Owen Taylor * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d8ec0ef04..d35f1a81e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Fri May 30 15:51:43 2003 Owen Taylor + + * glib/giochannel.c (g_io_error_get_from_g_error): + Do a g_return_val_if_fail() on err == NULL to be a + bit more robuts on buggy IO channel implementations. + (#113396, Dan Winship) + Tue May 27 19:56:35 2003 Owen Taylor * glib/gmacros.h: __PRETTY_FUNCTION__ was made a non-token diff --git a/glib/giochannel.c b/glib/giochannel.c index f3fae8b98..4bbda0971 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -131,6 +131,8 @@ static GIOError g_io_error_get_from_g_error (GIOStatus status, GError *err) { + g_return_val_if_fail (err != NULL, G_ERROR_ERROR_UNKNOWN); + switch (status) { case G_IO_STATUS_NORMAL: