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

MXS-2011 Immediately de-quote strings

Browse Source 
When receiving a command, such as

    CHANGE MASTER TO MASTER_HOST = '127.0.0.1' ...

when the value is extracted, the quotes are removed before the value
is returned.

Firstly, BLR does not anyway anywhere enforce that quotes are present
where they should be and, secondly, BLR currently does de-quoting all
over the place and with this change, all those places can be simplified.
This commit is contained in:
Johan Wikman
2018-08-23 11:38:01 +03:00
parent 19b059d303
commit f946272af1
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -5117,7 +5117,20 @@ blr_get_parsed_command_value(char *input)
*ptr-- = 0;
}
ret = MXS_STRDUP_A(strstr(value, word));
// Remove surrounding quotes.
char* p = strstr(value, word);
if (*p == '\'' || *p == '"')
{
char quote = *p;
++p;
int len = strlen(p);
if (len > 0 && p[len - 1] == quote)
{
p[len - 1] = 0;
}
}
ret = MXS_STRDUP_A(p);
}
}