database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.11' into 11.2

Browse Source
This commit is contained in:
Yuchen Pei
2024-09-18 10:45:26 +10:00
parent cfa9784edb a8c5717223
commit ff88633b9c
22 changed files with 894 additions and 4153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysql_plugin.c
View File

@@ -735,8 +735,8 @@ static int check_options(int argc, char **argv, char *operation)
{
int i= 0; /* loop counter */
int num_found= 0; /* number of options found (shortcut loop) */
char config_file[FN_REFLEN]; /* configuration file name */
char plugin_name[FN_REFLEN]; /* plugin name */
char config_file[FN_REFLEN+1]; /* configuration file name */
char plugin_name[FN_REFLEN+1]; /* plugin name */
/* Form prefix strings for the options. */
const char *basedir_prefix = "--basedir=";
@@ -784,8 +784,8 @@ static int check_options(int argc, char **argv, char *operation)
/* read the plugin config file and check for match against argument */
else
{
if (safe_strcpy_truncated(plugin_name, sizeof plugin_name, argv[i]) ||
safe_strcpy_truncated(config_file, sizeof config_file, argv[i]) ||
if (safe_strcpy_truncated(plugin_name, sizeof(plugin_name)-1, argv[i]) ||
safe_strcpy_truncated(config_file, sizeof(config_file)-1, argv[i]) ||
safe_strcat(config_file, sizeof(config_file), ".ini"))
{
fprintf(stderr, "ERROR: argument is too long.\n");