From 2e9a3b9f28f0d1d90f6075806e36a9f417d4a0dc Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Wed, 1 Dec 2010 01:38:19 +0000 Subject: [PATCH] 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 --- channels/chan_iax2.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index f6b2a42322..1e54616d19 100644 --- 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); -- 2.47.2