From 401a4233e492e3a2f83e86300b0004d524280e87 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Mon, 31 Jan 2011 13:34:26 +0100 Subject: [PATCH] Check that error exists before trying to set it. Fixes bug #640975. --- glib/gconvert.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/glib/gconvert.c b/glib/gconvert.c index 52a3dd8..b363bca 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -769,13 +769,14 @@ g_convert_with_iconv (const gchar *str, have_error = TRUE; break; default: - { - int errsv = errno; - - g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, - _("Error during conversion: %s"), - g_strerror (errsv)); - } + if (error) + { + int errsv = errno; + + g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, + _("Error during conversion: %s"), + g_strerror (errsv)); + } have_error = TRUE; break; } -- 2.7.4