diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-06 13:57:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-06 17:57:37 +0100 |
| commit | 1e361f286bc2cd42c79a4c0ac40209d222e60b11 (patch) | |
| tree | 93b0e3eb1b68d065965750e87e7299c841481194 /mysys/string.c | |
| parent | 9e4e4121b8b441d3b5b56edece0a05bb16caac3c (diff) | |
| download | mariadb-git-1e361f286bc2cd42c79a4c0ac40209d222e60b11.tar.gz | |
MDEV-4664 mysql_upgrade crashes if root's password contains an apostrophe/single quotation mark
fix dynstr_append_os_quoted() to escape single quotes correctly
for a POSIX shell
Diffstat (limited to 'mysys/string.c')
| -rw-r--r-- | mysys/string.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/string.c b/mysys/string.c index 06fd2c3d014..a63b1f502e5 100644 --- a/mysys/string.c +++ b/mysys/string.c @@ -143,8 +143,10 @@ my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append, ...) { #ifdef __WIN__ LEX_CSTRING quote= { C_STRING_WITH_LEN("\"") }; + LEX_CSTRING replace= { C_STRING_WITH_LEN("\\\"") }; #else LEX_CSTRING quote= { C_STRING_WITH_LEN("\'") }; + LEX_CSTRING replace= { C_STRING_WITH_LEN("'\"'\"'") }; #endif /* __WIN__ */ my_bool ret= TRUE; va_list dirty_text; @@ -160,8 +162,7 @@ my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append, ...) while(*(next_pos= strcend(cur_pos, quote.str[0])) != '\0') { ret&= dynstr_append_mem(str, cur_pos, (uint) (next_pos - cur_pos)); - ret&= dynstr_append_mem(str, STRING_WITH_LEN("\\")); - ret&= dynstr_append_mem(str, quote.str, quote.length); + ret&= dynstr_append_mem(str, replace.str, replace.length); cur_pos= next_pos + 1; } ret&= dynstr_append_mem(str, cur_pos, (uint) (next_pos - cur_pos)); |