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 bb-10.4-release into bb-10.5-release

Browse Source
This commit is contained in:
Nikita Malyavin
2021-05-05 23:17:20 +03:00
parent ca1dc0789b a4139f8d68
commit 3f55c56951
109 changed files with 1802 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_udf.cc
View File

@ -208,7 +208,7 @@ void udf_init()
DBUG_PRINT("info",("init udf record"));
LEX_CSTRING name;
name.str=get_field(&mem, table->field[0]);
name.length = (uint) strlen(name.str);
name.length = (uint) safe_strlen(name.str);
char *dl_name= get_field(&mem, table->field[2]);
bool new_dl=0;
Item_udftype udftype=UDFTYPE_FUNCTION;
@ -222,12 +222,12 @@ void udf_init()
On windows we must check both FN_LIBCHAR and '/'.
*/
if (check_valid_path(dl_name, strlen(dl_name)) ||
if (!name.str || !dl_name || check_valid_path(dl_name, strlen(dl_name)) ||
check_string_char_length(&name, 0, NAME_CHAR_LEN,
system_charset_info, 1))
{
sql_print_error("Invalid row in mysql.func table for function '%.64s'",
name.str);
safe_str(name.str));
continue;
}