[asterisk-commits] russell: branch 1.2-netsec r93679 - in /branches/1.2-netsec: ./ channels/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Dec 18 12:49:12 2007
New Revision: 93679

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93679
Log:
sync with 1.2

Modified:
    branches/1.2-netsec/   (props changed)
    branches/1.2-netsec/channels/chan_iax2.c

Propchange: branches/1.2-netsec/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 18 12:49:12 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-93668
+/branches/1.2:1-93678

Modified: branches/1.2-netsec/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.2-netsec/channels/chan_iax2.c?view=diff&rev=93679&r1=93678&r2=93679
==============================================================================
--- branches/1.2-netsec/channels/chan_iax2.c (original)
+++ branches/1.2-netsec/channels/chan_iax2.c Tue Dec 18 12:49:12 2007
@@ -2631,7 +2631,7 @@
 		var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL);
 		if (!var)
 			var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
-	} else {
+	} else if (sin) {
 		char porta[25];
 		ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr);
 		sprintf(porta, "%d", ntohs(sin->sin_port));