diff --git a/ChangeLog b/ChangeLog index 43f34b229..5a80e8646 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-08-02 Matthias Clasen + * glib/gconvert.c (g_convert_with_iconv): Don't go in an + infinite loop if the input text ends in an incomplete multibyte + character. (#312402, Sebastian Bacher) + * Bump version * === Released 2.7.5 === diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 43f34b229..5a80e8646 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-08-02 Matthias Clasen + * glib/gconvert.c (g_convert_with_iconv): Don't go in an + infinite loop if the input text ends in an incomplete multibyte + character. (#312402, Sebastian Bacher) + * Bump version * === Released 2.7.5 === diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 43f34b229..5a80e8646 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,9 @@ 2005-08-02 Matthias Clasen + * glib/gconvert.c (g_convert_with_iconv): Don't go in an + infinite loop if the input text ends in an incomplete multibyte + character. (#312402, Sebastian Bacher) + * Bump version * === Released 2.7.5 === diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 43f34b229..5a80e8646 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2005-08-02 Matthias Clasen + * glib/gconvert.c (g_convert_with_iconv): Don't go in an + infinite loop if the input text ends in an incomplete multibyte + character. (#312402, Sebastian Bacher) + * Bump version * === Released 2.7.5 === diff --git a/glib/gconvert.c b/glib/gconvert.c index 7f2df24cd..4504fd81b 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -544,6 +544,7 @@ g_convert_with_iconv (const gchar *str, { case EINVAL: /* Incomplete text, do not report an error */ + done = TRUE; break; case E2BIG: {