diff options
author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-15 14:56:22 +0200 |
---|---|---|
committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-15 14:56:22 +0200 |
commit | 38604de3a0fec8a3ff73b2e3c945617a1388759e (patch) | |
tree | 1f6056154dac86765a89799426b33248fabac00d /client/mysqltest.cc | |
parent | 4e23534bf7728edfda4e749563d1c9c2ad2d112e (diff) | |
download | mariadb-git-38604de3a0fec8a3ff73b2e3c945617a1388759e.tar.gz |
Bug #56753 mtr silently ignores junk after backticks
When stepping backward to end of `` expression, check for illegal chars
Diffstat (limited to 'client/mysqltest.cc')
-rw-r--r-- | client/mysqltest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 31854737cbc..a84ad2ad9e8 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -2181,8 +2181,14 @@ void var_query_set(VAR *var, const char *query, const char** query_end) DBUG_ENTER("var_query_set"); LINT_INIT(res); + /* Only white space or ) allowed past ending ` */ while (end > query && *end != '`') + { + if (*end && (*end != ' ' && *end != '\t' && *end != '\n' && *end != ')')) + die("Spurious text after `query` expression"); --end; + } + if (query == end) die("Syntax error in query, missing '`'"); ++query; |