summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2008-12-23 20:47:08 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2008-12-23 20:47:08 +0000
commit8c2030b489f828dec6f7a991b701fb066f7e71f2 (patch)
tree86f936496ef18a505f594223175525145f84188e /channels
parentaa905e347e971689f036ed9a2bf5238c67af31c6 (diff)
Allow semicolons and extended characters in user-specified SIP headers.
(closes issue #14110) Reported by: gork Patches: 20081222__bug14110__2.diff.txt uploaded by Corydon76 (license 14) Tested by: gork, putnopvut git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@166696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 87533cdba..559b1596b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -23616,7 +23616,7 @@ static int sip_addheader(struct ast_channel *chan, void *data)
int no = 0;
int ok = FALSE;
char varbuf[30];
- char *inbuf = data;
+ char *inbuf = data, *subbuf;
if (ast_strlen_zero(inbuf)) {
ast_log(LOG_WARNING, "This application requires the argument: Header\n");
@@ -23630,13 +23630,18 @@ static int sip_addheader(struct ast_channel *chan, void *data)
snprintf(varbuf, sizeof(varbuf), "__SIPADDHEADER%.2d", no);
/* Compare without the leading underscores */
- if( (pbx_builtin_getvar_helper(chan, (const char *) varbuf + 2) == (const char *) NULL) )
+ if ((pbx_builtin_getvar_helper(chan, (const char *) varbuf + 2) == (const char *) NULL)) {
ok = TRUE;
+ }
}
if (ok) {
- pbx_builtin_setvar_helper (chan, varbuf, inbuf);
- if (sipdebug)
+ size_t len = strlen(inbuf);
+ subbuf = alloca(len + 1);
+ ast_get_encoded_str(inbuf, subbuf, len + 1);
+ pbx_builtin_setvar_helper(chan, varbuf, subbuf);
+ if (sipdebug) {
ast_debug(1, "SIP Header added \"%s\" as %s\n", inbuf, varbuf);
+ }
} else {
ast_log(LOG_WARNING, "Too many SIP headers added, max 50\n");
}