From: Luigi Rizzo Date: Mon, 23 Oct 2006 14:35:37 +0000 (+0000) Subject: in function get_also_info(), move argument stripping X-Git-Tag: 1.6.0-beta1~3^2~4309 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee60094592c7e8cd72ad80568a091f27603e9229;p=thirdparty%2Fasterisk.git in function get_also_info(), move argument stripping before splitting around the @, otherwise the refer_to_domain might contain arguments as well, causing failures. I think this is a true bug that ought to be fixed in 1.4 as well. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45966 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 38523b22da..acb492c6ff 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8758,14 +8758,14 @@ static int get_also_info(struct sip_pvt *p, struct sip_request *oreq) return -1; } c += 4; + if ((a = strchr(c, ';'))) /* Remove arguments */ + *a = '\0'; + if ((a = strchr(c, '@'))) { /* Separate Domain */ *a++ = '\0'; ast_copy_string(referdata->refer_to_domain, a, sizeof(referdata->refer_to_domain)); } - if ((a = strchr(c, ';'))) /* Remove arguments */ - *a = '\0'; - if (sip_debug_test_pvt(p)) ast_verbose("Looking for %s in %s\n", c, p->context);