Don't go in an infinite loop if the input text ends in an incomplete

2005-08-02  Matthias Clasen  <mclasen@redhat.com>

	* 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)
This commit is contained in:
Matthias Clasen 2005-08-02 21:10:16 +00:00 committed by Matthias Clasen
parent 988eaa83c0
commit 74ff285644
5 changed files with 17 additions and 0 deletions

View File

@ -1,5 +1,9 @@
2005-08-02 Matthias Clasen <mclasen@redhat.com>
* 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 ===

View File

@ -1,5 +1,9 @@
2005-08-02 Matthias Clasen <mclasen@redhat.com>
* 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 ===

View File

@ -1,5 +1,9 @@
2005-08-02 Matthias Clasen <mclasen@redhat.com>
* 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 ===

View File

@ -1,5 +1,9 @@
2005-08-02 Matthias Clasen <mclasen@redhat.com>
* 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 ===

View File

@ -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:
{