From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 1 Dec 2010 01:46:32 +0000 (+0000)
Subject: Merged revisions 296950 via svnmerge from
X-Git-Tag: 1.8.2-rc1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a41c5537d9ea76b3b2f6f3ffe3e42c3ec527e9d3;p=thirdparty%2Fasterisk.git

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/branches/1.8@296951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 813d177948..58df353034 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);