sync with 1.2

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@94260 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index e4d826798812ff7fa9ab473511f517bbc6697c2f..820f474bd2681e361037a1d2c17769b60f89eec7 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2620,7 +2620,7 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin,
 
 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 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
                 * 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, };