hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix quoted value skipping

Browse Source 
The return value wasn't checked and the code assumed that a non-end
iterator was always returned.
This commit is contained in:
Markus Mäkelä
2019-01-18 10:25:12 +02:00
parent 2e95812b71
commit 28644e9626
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/modutil.cc
View File

@ -1540,13 +1540,19 @@ std::string get_canonical(GWBUF* querybuf)
else if (*it == '\'' || *it == '"') else if (*it == '\'' || *it == '"')
{ {
char c = *it; char c = *it;
it = find_char(std::next(it), buf.end(), c); if ((it = find_char(std::next(it), buf.end(), c)) == buf.end())
{
break;
}
rval[i++] = '?'; rval[i++] = '?';
} }
else if (*it == '`') else if (*it == '`')
{ {
auto start = it; auto start = it;
it = find_char(std::next(it), buf.end(), '`'); if ((it = find_char(std::next(it), buf.end(), '`')) == buf.end())
{
break;
}
std::copy(start, it, &rval[i]); std::copy(start, it, &rval[i]);
i += std::distance(start, it); i += std::distance(start, it);
rval[i++] = '`'; rval[i++] = '`';