automerge commit

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index b52c1acd435220aeec9e7bd5e3b5c3d0f5993674..e4d826798812ff7fa9ab473511f517bbc6697c2f 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2629,7 +2629,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 
        if (peername) {
                var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL);
-               if (!var)
+               if (!var && sin)
                        var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
        } else if (sin) {
                char porta[25];
@@ -2646,7 +2646,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
                        }
                }
        }
-       if (!var) { /* Last ditch effort */
+       if (!var && peername) { /* Last ditch effort */
                var = ast_load_realtime("iaxpeers", "name", peername, NULL);
                /*!\note
                 * If this one loaded something, then we need to ensure that the host