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

Check that error exists before trying to set it. Fixes bug #640975.

Browse Source
This commit is contained in:
Ignacio Casal Quinteiro 2011-01-31 13:34:26 +01:00
parent 72a8282231
commit 401a4233e4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glib/gconvert.c
View File

@ -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;
}