summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-07-25 13:27:11 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-07-25 13:27:11 +0200
commitae476868a5394041a00e75a29c7d45917e8dfae8 (patch)
treeb2f82005fe87bc5ce1ea92504b505a9d4e8b9781 /sql-common
parent8d0dabc56b09c6b40db15aac7da0da43d988759d (diff)
parent2536c0b1ebf6c5012ae34435d82fb2f5fa54aea5 (diff)
downloadmariadb-git-ae476868a5394041a00e75a29c7d45917e8dfae8.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client_plugin.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index bd1c8863143..d1226396446 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -362,7 +362,13 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
mysql->options.extension && mysql->options.extension->plugin_dir ?
mysql->options.extension->plugin_dir : PLUGINDIR, "/",
name, SO_EXT, NullS);
-
+
+ if (strpbrk(name, "()[]!@#$%^&/*;.,'?"))
+ {
+ errmsg= "invalid plugin name";
+ goto err;
+ }
+
DBUG_PRINT ("info", ("dlopeninig %s", dlpath));
/* Open new dll handle */
if (!(dlhandle= dlopen(dlpath, RTLD_NOW)))