automerge commit

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index d11b0b4b8e984cb9383ffca2742390c1bca4db05..f9821eabe4cb6dffdbca9a4d93192b90e532576b 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2563,7 +2563,8 @@ static int iax2_transmit(struct iax_frame *fr)
        iaxq.count++;
        ast_mutex_unlock(&iaxq.lock);
        /* Wake up the network thread */
-       pthread_kill(netthreadid, SIGURG);
+       if (netthreadid != AST_PTHREADT_NULL)
+               pthread_kill(netthreadid, SIGURG);
        return 0;
 }