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

@@ -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 == ' ')