diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-01 01:38:19 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-01 01:38:19 +0000 |
| commit | 4302ca50524b08d60563b5cc1150dfb6a622bc5f (patch) | |
| tree | c426e100c0fdf5adbe7384446aee86e4c24518bc | |
| parent | 7e33b5d88c746030df9a52ee89ff86e708842a74 (diff) | |
Missed initializations caused startup errors on Mac OS X (and possibly others, too).
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@296950 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index f6b2a4232..1e54616d1 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); |