database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-6752 Trailing incomplete characters are not replaced to question marks on conversion

Browse Source
This commit is contained in:
Alexander Barkov
2014-09-18 12:40:55 +04:00
parent 391fddf660
commit 8286bcd721
5 changed files with 96 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_string.cc
View File

@ -1022,8 +1022,15 @@ well_formed_copy_nchars(CHARSET_INFO *to_cs,
wc= '?';
}
else
break; // Not enough characters
{
if ((uchar *) from >= from_end)
break; // End of line
// Incomplete byte sequence
if (!*well_formed_error_pos)
*well_formed_error_pos= from;
from++;
wc= '?';
}
outp:
if ((cnvres= (*wc_mb)(to_cs, wc, (uchar*) to, to_end)) > 0)
to+= cnvres;