automerge commit

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index c497f30d69c0350e2e24ddbb1327785cbd81ee20..bff2100d71407b2e27dfc0d5d00e2153af1d7893 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1486,6 +1486,8 @@ static int send_packet(struct iax_frame *f)
        int res;
        char iabuf[INET_ADDRSTRLEN];
        /* Called with iaxsl held */
+       if (!iaxs[f->callno])
+               return -1;
        if (option_debug > 2 && iaxdebug)
                ast_log(LOG_DEBUG, "Sending %d on %d/%d to %s:%d\n", f->ts, f->callno, iaxs[f->callno]->peercallno, ast_inet_ntoa(iabuf, sizeof(iabuf), iaxs[f->callno]->addr.sin_addr), ntohs(iaxs[f->callno]->addr.sin_port));
        /* Don't send if there was an error, but return error instead */
@@ -1493,8 +1495,6 @@ static int send_packet(struct iax_frame *f)
                ast_log(LOG_WARNING, "Call number = %d\n", f->callno);
                return -1;
        }
-       if (!iaxs[f->callno])
-               return -1;
        if (iaxs[f->callno]->error)
                return -1;
        if (f->transfer) {