mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

src/util.c (_str_convert): don't drop valid byte sequence before first

Browse Source 
invalid one.
This commit is contained in:
Andrew Borodin 2009-04-29 20:05:01 +04:00
parent def581b24d
commit 45210ad625
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/strutil.c
View File

@ -101,7 +101,8 @@ _str_convert (GIConv coder, const char *string, int size, GString * buffer)
estr_t state = ESTR_SUCCESS;
gchar *tmp_buff = NULL;
gssize left;
gsize bytes_read, bytes_written;
gsize bytes_read = 0;
gsize bytes_written = 0;
GError *error = NULL;
errno = 0;
@ -153,10 +154,18 @@ _str_convert (GIConv coder, const char *string, int size, GString * buffer)
case G_CONVERT_ERROR_ILLEGAL_SEQUENCE:
/* Invalid byte sequence in conversion input. */
if (tmp_buff){
if ((tmp_buff == NULL) && (bytes_read != 0))
/* recode valid byte sequence */
tmp_buff = g_convert_with_iconv ((const gchar *) string,
bytes_read,
coder,
NULL, NULL, &error);
if (tmp_buff != NULL) {
g_string_append (buffer, tmp_buff);
g_free (tmp_buff);
}
if ((int)bytes_read < left)
{
string += bytes_read + 1;