diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-27 08:45:36 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-27 08:45:36 +0100 |
| commit | 9b4a179d69a1c795bef303a88f9d3195669f00ec (patch) | |
| tree | 87811d81af231e2945468ead0cba58cfc5514548 /storage/connect/reldef.cpp | |
| parent | 020dc54dabe64f238e8ef4f50a630a22e0f06949 (diff) | |
| parent | 7db489fc7dea2b4c236807035e57f169074c6682 (diff) | |
| download | mariadb-git-10.3-merge.tar.gz | |
Merge branch '10.2' into bb-10.3-release10.3-merge
Diffstat (limited to 'storage/connect/reldef.cpp')
| -rw-r--r-- | storage/connect/reldef.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/connect/reldef.cpp b/storage/connect/reldef.cpp index d7715a2ea9f..8be3a013e8c 100644 --- a/storage/connect/reldef.cpp +++ b/storage/connect/reldef.cpp @@ -93,7 +93,12 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char* tab, char* db, bool info) if (check_valid_path(module, strlen(module))) { strcpy(g->Message, "Module cannot contain a path"); return NULL; - } else + } + else if (strlen(subtype)+1+3 >= sizeof(getname)) { + strcpy(g->Message, "Subtype string too long"); + return NULL; + } + else PlugSetPath(soname, module, GetPluginDir()); // The exported name is always in uppercase |