diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-01 02:02:04 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-01 02:02:04 +0000 |
| commit | 597e913cd295fae7161684fe9b749c441632e5cf (patch) | |
| tree | eefc494efd6208545bb348888ea2d0c35afc2341 /channels | |
| parent | 48ac3ea2371f6b003c51ac7c99cef04c1203c908 (diff) | |
Merged revisions 296951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r296951 | tilghman | 2010-11-30 19:46:32 -0600 (Tue, 30 Nov 2010) | 9 lines
Merged revisions 296950 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r296950 | tilghman | 2010-11-30 19:38:19 -0600 (Tue, 30 Nov 2010) | 2 lines
Missed initializations caused startup errors on Mac OS X (and possibly others, too).
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@296952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -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 a32c64b83..abd158c01 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1438,6 +1438,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; } @@ -12090,10 +12093,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); |