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

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Dec 20 14:32:58 2007
New Revision: 94260

URL: http://svn.digium.com/view/asterisk?view=rev&rev=94260
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 Thu Dec 20 14:32:58 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-94243
+/branches/1.2:1-94259

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=94260&r1=94259&r2=94260
==============================================================================
--- branches/1.2-netsec/channels/chan_iax2.c (original)
+++ branches/1.2-netsec/channels/chan_iax2.c Thu Dec 20 14:32:58 2007
@@ -2620,7 +2620,7 @@
 
 static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in *sin)
 {
-	struct ast_variable *var;
+	struct ast_variable *var = NULL;
 	struct ast_variable *tmp;
 	struct iax2_peer *peer=NULL;
 	time_t regseconds, nowtime;
@@ -2654,7 +2654,7 @@
 		 * is because we only have the IP address and the host field might be
 		 * set as a name (and the reverse PTR might not match).
 		 */
-		if (var) {
+		if (var && sin) {
 			for (tmp = var; tmp; tmp = tmp->next) {
 				if (!strcasecmp(tmp->name, "host")) {
 					struct in_addr sin2 = { 0, };