summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2010-09-15 14:56:22 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2010-09-15 14:56:22 +0200
commit6ff48a61f23a1241d7db95e4f84f1a132a4f08d0 (patch)
tree1f6056154dac86765a89799426b33248fabac00d /client
parent64ae6d4a7e8f507d48c1b4fc0985d1d2733d6ce1 (diff)
downloadmariadb-git-6ff48a61f23a1241d7db95e4f84f1a132a4f08d0.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')
-rw-r--r--client/mysqltest.cc6
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;