1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct length check in my_wc_mb_filename()

Browse Source
This commit is contained in:
Jan Lindström 2015-12-07 09:20:31 +02:00
parent e528fe79b8
commit d85168e40d
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/ctype_filename.result
View File

@ -11,3 +11,6 @@ create table com1 (a int);
drop table com1; drop table com1;
create table `clock$` (a int); create table `clock$` (a int);
drop table `clock$`; drop table `clock$`;
select convert(convert(',' using filename) using binary);
convert(convert(',' using filename) using binary)
@002c

3
mysql-test/t/ctype_filename.test
View File

@ -19,3 +19,6 @@ drop table com1;
create table `clock$` (a int); create table `clock$` (a int);
drop table `clock$`; drop table `clock$`;
select convert(convert(',' using filename) using binary);

2
strings/ctype-utf8.c
View File

@ -4585,7 +4585,7 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)),
} }
/* Non letter */ /* Non letter */
if (s + 5 > e) if (s + 4 > e)
return MY_CS_TOOSMALL5; return MY_CS_TOOSMALL5;
*s++= hex[(wc >> 12) & 15]; *s++= hex[(wc >> 12) & 15];