kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

_really_ rewrite get_in_brackets to do the right thing (including skipping escaped double-quote characters)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6205 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-07-25 21:40:17 +00:00
parent 8223580a4a
commit 6596f8496e
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
channels/chan_sip.c
View File

@@ -1321,31 +1321,46 @@ static void url_decode(char *s)
*o = '\0'; *o = '\0';
} }
/*--- get_in_brackets: Pick out text in braces from character string ---*/ /*--- get_in_brackets: Pick out text in brackets from character string ---*/
/* returns pointer to terminated stripped string. modifies input string. */ /* returns pointer to terminated stripped string. modifies input string. */
static char *get_in_brackets(char *tmp) static char *get_in_brackets(char *tmp)
{ {
char *c = tmp, *n, *q; char *parse;
char *first_quote;
char *first_bracket;
char *second_bracket;
char last_char;
if ((q = strchr(tmp, '"'))) { parse = tmp;
c = q + 1; while (1) {
if ((q = strchr(c, '"')) ) first_quote = strchr(parse, '"');
c = q + 1; first_bracket = strchr(parse, '<');
else { if (first_quote && first_bracket && (first_quote < first_bracket)) {
ast_log(LOG_WARNING, "No closing quote in '%s'\n", tmp); last_char = '\0';
c = tmp; for (parse = first_quote + 1; *parse; parse++) {
if ((*parse == '"') && (last_char != '\\'))
break;
last_char = *parse;
}
if (!*parse) {
ast_log(LOG_WARNING, "No closing quote found in '%s'\n", tmp);
return tmp;
}
parse++;
continue;
}
if (first_bracket) {
second_bracket = strchr(first_bracket + 1, '>');
if (second_bracket) {
*second_bracket = '\0';
return first_bracket + 1;
} else {
ast_log(LOG_WARNING, "No closing bracket found in '%s'\n", tmp);
return tmp;
} }
} }
if ((n = strchr(c, '<')) ) { return tmp;
c = n + 1;
while (*c && *c != '>') c++;
if (*c != '>') {
ast_log(LOG_WARNING, "No closing brace in '%s'\n", tmp);
} else
*c = '\0';
return n+1;
} }
return c;
} }
/*--- sip_sendtext: Send SIP MESSAGE text within a call ---*/ /*--- sip_sendtext: Send SIP MESSAGE text within a call ---*/