diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2023-02-15 16:30:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-02-15 16:30:53 +0100 |
| commit | b45ed284a69cdbffac61bdcf74bf86fa7b7391a4 (patch) | |
| tree | de26ce8e0a5aa40889e889d758e3a3a98b9f71a8 /storage/connect/myconn.cpp | |
| parent | cc182aca9352fb7efde0deb0a83844e1d5f0c64c (diff) | |
| parent | cafba8761af55ae16cc69c9b53a341340a845b36 (diff) | |
| download | mariadb-git-bb-11.0-all-builders.tar.gz | |
Merge branch '10.11' into 11.0bb-11.0-all-builders
Diffstat (limited to 'storage/connect/myconn.cpp')
| -rw-r--r-- | storage/connect/myconn.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp index 4c16a7fc1aa..bb6f72de1f8 100644 --- a/storage/connect/myconn.cpp +++ b/storage/connect/myconn.cpp @@ -405,18 +405,20 @@ PQRYRES SrcColumns(PGLOBAL g, const char *host, const char *db, port = mysqld_port; if (!strnicmp(srcdef, "select ", 7) || strstr(srcdef, "%s")) { - query = (char *)PlugSubAlloc(g, NULL, strlen(srcdef) + 10); + size_t query_sz = strlen(srcdef) + 10; + query = (char *)PlugSubAlloc(g, NULL, query_sz); if ((p= strstr(srcdef, "%s"))) { /* Replace %s with 1=1 */ - sprintf(query, "%.*s1=1%s", (int) (p - srcdef), srcdef, p + 2); // dummy where clause + snprintf(query, query_sz, "%.*s1=1%s", + (int) (p - srcdef), srcdef, p + 2); // dummy where clause } - else - strcpy(query, srcdef); + else + safe_strcpy(query, query_sz, srcdef); if (!strnicmp(srcdef, "select ", 7)) - strcat(query, " LIMIT 0"); + safe_strcat(query, query_sz, " LIMIT 0"); } else query = (char *)srcdef; |