[svn-commits] mmichelson: trunk r134556 - /trunk/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 30 15:24:40 2008
New Revision: 134556

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134556
Log:
Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg


Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=134556&r1=134555&r2=134556
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jul 30 15:24:40 2008
@@ -11006,6 +11006,8 @@
 	if (ast_strlen_zero(tmp))
 		return 0;
 
+	params = strchr(tmp, ';');
+
 	exten = get_in_brackets(tmp);
 	if (!strncasecmp(exten, "sip:", 4)) {
 		exten += 4;
@@ -11017,7 +11019,7 @@
 	}
 
 	/* Get diversion-reason param if present */
-	if ((params = strchr(tmp, ';'))) {
+	if (params) {
 		*params = '\0';	/* Cut off parameters  */
 		params++;
 		while (*params == ';' || *params == ' ')