database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-11 11:25:33 +02:00
parent 7b05fc5cdd a917be3e7f
commit fd132be117
284 changed files with 7487 additions and 1880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_plugin.cc
View File

@ -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);