diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-09 22:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-09 22:04:06 +0200 |
| commit | ef781162ff2eb97f405b19dc150ab674e91dbc05 (patch) | |
| tree | 63b897dece50ab65652174af4cd0aabd8f3a8505 /sql/sql_plugin.cc | |
| parent | e9af6b2a4d8750c32d4953f08f8bc5f2e33cb9e3 (diff) | |
| parent | 16cebed54065ad9e18953aa86d48f6007d53c2d3 (diff) | |
| download | mariadb-git-ef781162ff2eb97f405b19dc150ab674e91dbc05.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 18f848f3cd3..ee94f2d7d07 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -374,7 +374,8 @@ bool check_valid_path(const char *path, size_t len) static void fix_dl_name(MEM_ROOT *root, LEX_CSTRING *dl) { const size_t so_ext_len= sizeof(SO_EXT) - 1; - if (my_strcasecmp(&my_charset_latin1, dl->str + dl->length - so_ext_len, + if (dl->length < so_ext_len || + my_strcasecmp(&my_charset_latin1, dl->str + dl->length - so_ext_len, SO_EXT)) { char *s= (char*)alloc_root(root, dl->length + so_ext_len + 1); |