From 26842b87bf6075bb4fc442964bf082238dcd2775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Sun, 7 Jun 2020 22:35:47 +0200 Subject: [PATCH] Prevent crash if CHARACTER_SET_CONNECTION is not initialized yet #2863 --- lib/mysql_connection.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp index 9c369c3cf..7caa5fe82 100644 --- a/lib/mysql_connection.cpp +++ b/lib/mysql_connection.cpp @@ -79,7 +79,10 @@ void Variable::fill_client_internal_session(json &j, int idx) { } else if (idx == SQL_CHARACTER_SET_CONNECTION) { const MARIADB_CHARSET_INFO *ci = NULL; - ci = proxysql_find_charset_nr(atoi(value)); + if (!value) + ci = proxysql_find_charset_collate(mysql_tracked_variables[idx].default_value); + else + ci = proxysql_find_charset_nr(atoi(value)); j["conn"][mysql_tracked_variables[idx].internal_variable_name] = (ci && ci->csname)?ci->csname:""; } else if (idx == SQL_COLLATION_CONNECTION) { const MARIADB_CHARSET_INFO *ci = NULL;