diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-03-16 11:43:30 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-03-16 11:43:30 +0100 |
| commit | 56402e84b5ba242214ff4d3c4a647413cbe60ff3 (patch) | |
| tree | deaa411a3494e14dcb5eb5075566b5cce1189238 | |
| parent | 92d61c222982aa705402fd4addc54fa610106204 (diff) | |
| download | mariadb-git-56402e84b5ba242214ff4d3c4a647413cbe60ff3.tar.gz | |
MDEV-21824
Crash in convert_error_message
restore check for client charset_info == NULL, which was previously
removed in MDEV-8844
| -rw-r--r-- | sql/sql_error.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 4045f30a6bd..e5dda9904d2 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -947,7 +947,7 @@ size_t convert_error_message(char *to, size_t to_length, CHARSET_INFO *to_cs, /* Make room for the null terminator. */ to_length--; - if (to_cs == &my_charset_bin) + if (!to_cs || to_cs == &my_charset_bin) to_cs= system_charset_info; uint32 cnv_length= my_convert_using_func(to, to_length, to_cs, |