From b26e8861c141a9dbb5631b5d6a18a1aa8263c907 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 23 Apr 2004 14:12:54 +0000 Subject: [PATCH] Don't call g_strerror() here, since it can lead to infinite recursion. 2004-04-23 Matthias Clasen * glib/gconvert.c (open_converter): Don't call g_strerror() here, since it can lead to infinite recursion. (#139133, Piotr Klaban) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gconvert.c | 4 ++-- 7 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1075765c..9d2281e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-04-23 Matthias Clasen + + * glib/gconvert.c (open_converter): Don't call g_strerror() here, + since it can lead to infinite recursion. (#139133, Piotr Klaban) + 2004-04-22 Matthias Clasen * tests/testglib.c (main): Trivial warning fix. (#140345) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1075765c..9d2281e6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-04-23 Matthias Clasen + + * glib/gconvert.c (open_converter): Don't call g_strerror() here, + since it can lead to infinite recursion. (#139133, Piotr Klaban) + 2004-04-22 Matthias Clasen * tests/testglib.c (main): Trivial warning fix. (#140345) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1075765c..9d2281e6 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-04-23 Matthias Clasen + + * glib/gconvert.c (open_converter): Don't call g_strerror() here, + since it can lead to infinite recursion. (#139133, Piotr Klaban) + 2004-04-22 Matthias Clasen * tests/testglib.c (main): Trivial warning fix. (#140345) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1075765c..9d2281e6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-04-23 Matthias Clasen + + * glib/gconvert.c (open_converter): Don't call g_strerror() here, + since it can lead to infinite recursion. (#139133, Piotr Klaban) + 2004-04-22 Matthias Clasen * tests/testglib.c (main): Trivial warning fix. (#140345) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1075765c..9d2281e6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-04-23 Matthias Clasen + + * glib/gconvert.c (open_converter): Don't call g_strerror() here, + since it can lead to infinite recursion. (#139133, Piotr Klaban) + 2004-04-22 Matthias Clasen * tests/testglib.c (main): Trivial warning fix. (#140345) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1075765c..9d2281e6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-04-23 Matthias Clasen + + * glib/gconvert.c (open_converter): Don't call g_strerror() here, + since it can lead to infinite recursion. (#139133, Piotr Klaban) + 2004-04-22 Matthias Clasen * tests/testglib.c (main): Trivial warning fix. (#140345) diff --git a/glib/gconvert.c b/glib/gconvert.c index f504c6fe..3a17a269 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -403,8 +403,8 @@ open_converter (const gchar *to_codeset, from_codeset, to_codeset); else g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, - _("Could not open converter from '%s' to '%s': %s"), - from_codeset, to_codeset, g_strerror (errno)); + _("Could not open converter from '%s' to '%s'"), + from_codeset, to_codeset); return cd; } -- 2.34.1