Commit d85168e4 authored by Jan Lindström's avatar Jan Lindström

Correct length check in my_wc_mb_filename()

parent e528fe79
...@@ -11,3 +11,6 @@ create table com1 (a int); ...@@ -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
...@@ -19,3 +19,6 @@ drop table com1; ...@@ -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);
...@@ -4585,7 +4585,7 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)), ...@@ -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];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment