diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-05-07 19:20:17 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-05-09 16:01:30 +0400 |
| commit | cfe5ee90c8e4b9dfa98a41fcd299197a59261be7 (patch) | |
| tree | 35fdaabac55d4b36d228bc9600112e986850b162 /sql/sql_string.cc | |
| parent | c675886dcdecd29571bd08605a409325ee81004c (diff) | |
| download | mariadb-git-cfe5ee90c8e4b9dfa98a41fcd299197a59261be7.tar.gz | |
MDEV-22043 Special character leads to assertion in my_wc_to_printable_generic on 10.5.2 (debug)
The code did not take into account that:
- U+005C (backslash) can occupy more than mbminlen characters (e.g. in sjis)
- Some character sets do not have a code for U+005C (e.g. swe7)
Adding a new function my_wc_to_printable into MY_CHARSET_HANDLER to
cover all special cases easier.
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 2fc6ae0ad7d..030075aa793 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -791,7 +791,7 @@ bool Binary_string::copy_printable_hhhh(CHARSET_INFO *to_cs, if (bytes_needed >= UINT_MAX32 || alloc((size_t) bytes_needed)) return true; str_length= my_convert_using_func(Ptr, Alloced_length, to_cs, - my_wc_to_printable_generic, + to_cs->cset->wc_to_printable, from, from_length, from_cs, from_cs->cset->mb_wc, |