MDEV-24879 Client crash on undefined charsetsdir

c4807c10 · Sergei Golubchik · 3dae5647 · c4807c10
Commit c4807c10 authored Mar 23, 2021 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

client/mysql.cc client/mysql.cc +5 -1

No files found.
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -4720,7 +4720,11 @@ sql_real_connect(char *host,char *database,char *user,char *password,
    return -1;					// Retryable
  }

-  charset_info= get_charset_by_name(mysql.charset->name, MYF(0));
+  if (!(charset_info= get_charset_by_name(mysql.charset->name, MYF(0))))
+  {
+    put_info("Unknown default character set", INFO_ERROR);
+    return 1;
+  }

  
  connected=1;