From d6b4e025b0cdd55736021041522e44aa895a96ae Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 30 Jul 2008 20:25:57 +0000 Subject: [PATCH] Merged revisions 134556 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r134556 | mmichelson | 2008-07-30 15:24:40 -0500 (Wed, 30 Jul 2008) | 7 lines Fix the parsing of the "reason" parameter in the Diversion: header. (closes issue #13195) Reported by: woodsfsg ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134561 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a6b96f3cdd..0d1746f608 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10589,6 +10589,8 @@ static int get_rdnis(struct sip_pvt *p, struct sip_request *oreq) if (ast_strlen_zero(tmp)) return 0; + params = strchr(tmp, ';'); + exten = get_in_brackets(tmp); if (!strncasecmp(exten, "sip:", 4)) { exten += 4; @@ -10600,7 +10602,7 @@ static int get_rdnis(struct sip_pvt *p, struct sip_request *oreq) } /* Get diversion-reason param if present */ - if ((params = strchr(tmp, ';'))) { + if (params) { *params = '\0'; /* Cut off parameters */ params++; while (*params == ';' || *params == ' ')