summaryrefslogtreecommitdiff
path: root/channel.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2005-04-01 21:38:17 +0000
committerKevin P. Fleming <kpfleming@digium.com>2005-04-01 21:38:17 +0000
commit33801137f8f9d518b84eb84b558dd41f9d9cea8d (patch)
tree3006da0c89814d9a665b2f0658f960932823358f /channel.c
parent3da361ee77ac5b3daf90f7c91765e85eccd6a18a (diff)
don't take the channel list lock until we're actually ready to put the new channel into the list in ast_channel_alloc (bug #3928)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
-rwxr-xr-xchannel.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/channel.c b/channel.c
index 460d1b781..0f73af1d7 100755
--- a/channel.c
+++ b/channel.c
@@ -322,11 +322,9 @@ struct ast_channel *ast_channel_alloc(int needqueue)
if (shutting_down)
return NULL;
- ast_mutex_lock(&chlock);
tmp = malloc(sizeof(struct ast_channel));
if (!tmp) {
ast_log(LOG_WARNING, "Out of memory\n");
- ast_mutex_unlock(&chlock);
return NULL;
}
@@ -335,7 +333,6 @@ struct ast_channel *ast_channel_alloc(int needqueue)
if (!tmp->sched) {
ast_log(LOG_WARNING, "Unable to create schedule context\n");
free(tmp);
- ast_mutex_unlock(&chlock);
return NULL;
}
@@ -359,7 +356,6 @@ struct ast_channel *ast_channel_alloc(int needqueue)
if (pipe(tmp->alertpipe)) {
ast_log(LOG_WARNING, "Alert pipe creation failed!\n");
free(tmp);
- ast_mutex_unlock(&chlock);
return NULL;
} else {
flags = fcntl(tmp->alertpipe[0], F_GETFL);
@@ -396,6 +392,7 @@ struct ast_channel *ast_channel_alloc(int needqueue)
tmp->tech = &null_tech;
+ ast_mutex_lock(&chlock);
tmp->next = channels;
channels = tmp;