mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-20 08:40:16 +00:00
Allow application arguments to be quoted, allowing '|' characters inside arguments
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
12
app.c
12
app.c
@@ -1109,7 +1109,7 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra
|
|||||||
{
|
{
|
||||||
int argc;
|
int argc;
|
||||||
char *scan;
|
char *scan;
|
||||||
int paren = 0;
|
int paren = 0, quote = 0;
|
||||||
|
|
||||||
if (!buf || !array || !arraylen)
|
if (!buf || !array || !arraylen)
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1126,7 +1126,15 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra
|
|||||||
else if (*scan == ')') {
|
else if (*scan == ')') {
|
||||||
if (paren)
|
if (paren)
|
||||||
paren--;
|
paren--;
|
||||||
} else if ((*scan == delim) && !paren) {
|
} else if (*scan == '"') {
|
||||||
|
quote = quote ? 0 : 1;
|
||||||
|
/* Remove quote character from argument */
|
||||||
|
memmove(scan, scan + 1, strlen(scan));
|
||||||
|
scan--;
|
||||||
|
} else if (*scan == '\\') {
|
||||||
|
/* Literal character, don't parse */
|
||||||
|
memmove(scan, scan + 1, strlen(scan));
|
||||||
|
} else if ((*scan == delim) && !paren && !quote) {
|
||||||
*scan++ = '\0';
|
*scan++ = '\0';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user