[svn-commits] mmichelson: branch 1.6.0 r134561 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 30 15:25:57 2008
New Revision: 134561

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134561
Log:
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


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=134561&r1=134560&r2=134561
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Jul 30 15:25:57 2008
@@ -10589,6 +10589,8 @@
 	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 @@
 	}
 
 	/* Get diversion-reason param if present */
-	if ((params = strchr(tmp, ';'))) {
+	if (params) {
 		*params = '\0';	/* Cut off parameters  */
 		params++;
 		while (*params == ';' || *params == ' ')