Missed initializations caused startup errors on Mac OS X (and possibly others, too).

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index f6b2a4232210e5b2fab2ceed93655afa76fb5534..1e54616d192d5a381c1280179157ee3f19d5dec3 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1341,6 +1341,9 @@ static struct iax2_thread *find_idle_thread(void)
        if (ast_pthread_create_background(&thread->threadid, NULL, iax2_process_thread, thread)) {
                ast_cond_destroy(&thread->cond);
                ast_mutex_destroy(&thread->lock);
+               ast_mutex_unlock(&thread->init_lock);
+               ast_cond_destroy(&thread->init_cond);
+               ast_mutex_destroy(&thread->init_lock);
                ast_free(thread);
                return NULL;
        }
@@ -11757,10 +11760,17 @@ static int start_network_thread(void)
                        thread->threadnum = ++threadcount;
                        ast_mutex_init(&thread->lock);
                        ast_cond_init(&thread->cond, NULL);
+                       ast_mutex_init(&thread->init_lock);
+                       ast_cond_init(&thread->init_cond, NULL);
                        if (ast_pthread_create_background(&thread->threadid, NULL, iax2_process_thread, thread)) {
                                ast_log(LOG_WARNING, "Failed to create new thread!\n");
+                               ast_mutex_destroy(&thread->lock);
+                               ast_cond_destroy(&thread->cond);
+                               ast_mutex_destroy(&thread->init_lock);
+                               ast_cond_destroy(&thread->init_cond);
                                ast_free(thread);
                                thread = NULL;
+                               continue;
                        }
                        AST_LIST_LOCK(&idle_list);
                        AST_LIST_INSERT_TAIL(&idle_list, thread, list);