kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 07:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix directed pickup deadlock bug (bug #5270)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-09-24 14:22:12 +00:00
parent a21c9058e0
commit 2e5537a4a0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_directed_pickup.c
View File

@@ -51,7 +51,7 @@ LOCAL_USER_DECL;
static int pickup_exec(struct ast_channel *chan, void *data) static int pickup_exec(struct ast_channel *chan, void *data)
{ {
int res = -1; int res = 0;
struct localuser *u = NULL; struct localuser *u = NULL;
struct ast_channel *origin = NULL, *target = NULL; struct ast_channel *origin = NULL, *target = NULL;
char *tmp = NULL, *exten = NULL, *context = NULL; char *tmp = NULL, *exten = NULL, *context = NULL;
@@ -100,6 +100,7 @@ static int pickup_exec(struct ast_channel *chan, void *data)
if (res) { if (res) {
ast_log(LOG_WARNING, "Unable to answer '%s'\n", chan->name); ast_log(LOG_WARNING, "Unable to answer '%s'\n", chan->name);
res = -1; res = -1;
ast_mutex_unlock(&target->lock);
goto out; goto out;
} }
res = ast_queue_control(chan, AST_CONTROL_ANSWER); res = ast_queue_control(chan, AST_CONTROL_ANSWER);
@@ -107,12 +108,14 @@ static int pickup_exec(struct ast_channel *chan, void *data)
ast_log(LOG_WARNING, "Unable to queue answer on '%s'\n", ast_log(LOG_WARNING, "Unable to queue answer on '%s'\n",
chan->name); chan->name);
res = -1; res = -1;
ast_mutex_unlock(&target->lock);
goto out; goto out;
} }
res = ast_channel_masquerade(target, chan); res = ast_channel_masquerade(target, chan);
if (res) { if (res) {
ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan->name, target->name); ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan->name, target->name);
res = -1; res = -1;
ast_mutex_unlock(&target->lock);
goto out; goto out;
} }
/* Done */ /* Done */