diff options
| author | Arnavion <arnavion@gmail.com> | 2016-06-24 12:09:35 -0700 |
|---|---|---|
| committer | Arnavion <arnavion@gmail.com> | 2016-06-24 12:09:35 -0700 |
| commit | 16ba39d9fa2983be6b8223858ab3ff90930e3827 (patch) | |
| tree | 97918d8d35bd5d0da49fbe5cf28520e9a38b1a7d /src/common/text.c | |
| parent | 4ed1acfd522ccb8b90c44b8734ac77eb28c1453a (diff) | |
Forcibly reset iconv converter after every conversion.
Despite what g_convert_with_iconv's docs say, it does not reset the converter on a failed conversion (iconv returns -1). Fixes #1758
Diffstat (limited to 'src/common/text.c')
| -rw-r--r-- | src/common/text.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/common/text.c b/src/common/text.c index 06f72cfb..ad6f10ff 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -742,6 +742,8 @@ text_convert_invalid (const gchar* text, gssize len, GIConv converter, const gch /* Find the first position of an invalid sequence. */ result_part = g_convert_with_iconv (text, len, converter, &invalid_start_pos, &result_part_len, NULL); + g_iconv (converter, NULL, NULL, NULL, NULL); + if (result_part != NULL) { /* All text converted successfully on the first try. Return it. */ @@ -763,8 +765,15 @@ text_convert_invalid (const gchar* text, gssize len, GIConv converter, const gch { g_assert (current_start + invalid_start_pos < end); - /* Convert everything before the position of the invalid sequence. It should be successful. */ + /* Convert everything before the position of the invalid sequence. It should be successful. + * But iconv may not convert everything till invalid_start_pos since the last few bytes may be part of a shift sequence. + * So get the new bytes_read and use it as the actual invalid_start_pos to handle this. + * + * See https://github.com/hexchat/hexchat/issues/1758 + */ result_part = g_convert_with_iconv (current_start, invalid_start_pos, converter, &invalid_start_pos, &result_part_len, NULL); + g_iconv (converter, NULL, NULL, NULL, NULL); + g_assert (result_part != NULL); g_string_append_len (result, result_part, result_part_len); g_free (result_part); @@ -776,6 +785,8 @@ text_convert_invalid (const gchar* text, gssize len, GIConv converter, const gch current_start += invalid_start_pos + 1; result_part = g_convert_with_iconv (current_start, end - current_start, converter, &invalid_start_pos, &result_part_len, NULL); + g_iconv (converter, NULL, NULL, NULL, NULL); + if (result_part != NULL) { /* The rest of the text converted successfully. Append it and return the whole converted text. */ |