[Asterisk-cvs] asterisk/channels chan_sip.c,1.647,1.648

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv12089/channels

Modified Files:
	chan_sip.c 
Log Message:
Fix callerid segfault in rare combination (bug #3519)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -d -r1.647 -r1.648
--- chan_sip.c	3 Feb 2005 05:31:01 -0000	1.647
+++ chan_sip.c	7 Feb 2005 14:56:43 -0000	1.648
@@ -3746,7 +3746,7 @@
 		l = p->owner->cid.cid_num;
 		n = p->owner->cid.cid_name;
 	}
-	if ((!l || !ast_isphonenumber(l)) && default_callerid[0])
+	if (!l || (!ast_isphonenumber(l) && default_callerid[0]))
 			l = default_callerid;
 	/* if user want's his callerid restricted */
 	if (p->callingpres & AST_PRES_PROHIB_USER_NUMBER_NOT_SCREENED) {