mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
fixed config parser to recognize correctly strings like following:
test="\"#no comment here"#real comment
This commit is contained in:
parent
f657ea978b
commit
8215fbe957
1 changed files with 4 additions and 2 deletions
|
@ -449,11 +449,12 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
|
|||
|
||||
static char *remove_end_comment(char *ptr)
|
||||
{
|
||||
char quote= 0;
|
||||
char quote= 0; /* we are inside quote marks */
|
||||
char escape= 0; /* symbol is protected by escape chagacter */
|
||||
|
||||
for (; *ptr; ptr++)
|
||||
{
|
||||
if (*ptr == '\'' || *ptr == '\"')
|
||||
if ((*ptr == '\'' || *ptr == '\"') && !escape)
|
||||
{
|
||||
if (!quote)
|
||||
quote= *ptr;
|
||||
|
@ -465,6 +466,7 @@ static char *remove_end_comment(char *ptr)
|
|||
*ptr= 0;
|
||||
return ptr;
|
||||
}
|
||||
escape= (quote && *ptr == '\\' && !escape);
|
||||
}
|
||||
return ptr;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue