diff --git a/ChangeLog b/ChangeLog index af4591964..1a385d4ea 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) + 2003-05-30 Telsa Gwynne * configure.in: Added "cy" (Welsh) to configure.in diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index af4591964..1a385d4ea 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) + 2003-05-30 Telsa Gwynne * configure.in: Added "cy" (Welsh) to configure.in diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index af4591964..1a385d4ea 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) + 2003-05-30 Telsa Gwynne * configure.in: Added "cy" (Welsh) to configure.in diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index af4591964..1a385d4ea 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) + 2003-05-30 Telsa Gwynne * configure.in: Added "cy" (Welsh) to configure.in diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index af4591964..1a385d4ea 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) + 2003-05-30 Telsa Gwynne * configure.in: Added "cy" (Welsh) to configure.in diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index af4591964..1a385d4ea 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) + 2003-05-30 Telsa Gwynne * configure.in: Added "cy" (Welsh) to configure.in diff --git a/glib/giochannel.c b/glib/giochannel.c index 08aaa6b13..3b02228d3 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: