kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

do not escape strings inside single quotes unless we can find a closing quote too

This commit is contained in:
Anthony Minessale 2011-09-13 16:50:05 -05:00
parent 4cb49fbaa0
commit b4b99c410d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_utils.c
View File

@ -1871,7 +1871,7 @@ static char *cleanup_separated_string(char *str, char delim)
} }
} }
if (!esc) { if (!esc) {
if (*ptr == '\'') { if (*ptr == '\'' && (inside_quotes || ((ptr+1) && strchr(ptr+1, '\'')))) {
if ((inside_quotes = (1 - inside_quotes))) { if ((inside_quotes = (1 - inside_quotes))) {
end = dest; end = dest;
} }
@ -1934,7 +1934,7 @@ static unsigned int separate_string_char_delim(char *buf, char delim, char **arr
/* escaped characters are copied verbatim to the destination string */ /* escaped characters are copied verbatim to the destination string */
if (*ptr == ESCAPE_META) { if (*ptr == ESCAPE_META) {
++ptr; ++ptr;
} else if (*ptr == '\'') { } else if (*ptr == '\'' && (inside_quotes || ((ptr+1) && strchr(ptr+1, '\'')))) {
inside_quotes = (1 - inside_quotes); inside_quotes = (1 - inside_quotes);
} else if (*ptr == delim && !inside_quotes) { } else if (*ptr == delim && !inside_quotes) {
*ptr = '\0'; *ptr = '\0';