diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-05-12 10:55:18 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-05-12 11:11:43 +0400 |
| commit | b9adaeb491a36170a140799bce0de911d654c2d6 (patch) | |
| tree | a0d8b595d44fa598788ff8cf41fa701a837e72d2 /sql/lex_charset.cc | |
| parent | 404984980feeb4d9d4906cbd166f38d163b096d2 (diff) | |
| download | mariadb-git-b9adaeb491a36170a140799bce0de911d654c2d6.tar.gz | |
MDEV-28481 SIGSEGV in Lex_charset_collation_st::find_bin_collation
Diffstat (limited to 'sql/lex_charset.cc')
| -rw-r--r-- | sql/lex_charset.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/lex_charset.cc b/sql/lex_charset.cc index c6c9e402731..7570abbdfb9 100644 --- a/sql/lex_charset.cc +++ b/sql/lex_charset.cc @@ -41,10 +41,11 @@ CHARSET_INFO *Lex_charset_collation_st::find_bin_collation(CHARSET_INFO *cs) return cs; // CREATE TABLE t1 (a CHAR(10) BINARY) CHARACTER SET utf8mb4; + const LEX_CSTRING &cs_name= cs->cs_name; if (!(cs= get_charset_by_csname(cs->cs_name.str, MY_CS_BINSORT, MYF(0)))) { char tmp[65]; - strxnmov(tmp, sizeof(tmp)-1, cs->cs_name.str, "_bin", NULL); + strxnmov(tmp, sizeof(tmp)-1, cs_name.str, "_bin", NULL); my_error(ER_UNKNOWN_COLLATION, MYF(0), tmp); } return cs; |