aboutsummaryrefslogtreecommitdiffstats
path: root/pbx.c
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-05 20:01:19 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-05 20:01:19 +0000
commit02c6ce8d10f73f338631c9039ca28e6b17c49fd6 (patch)
treeeefc66a4df5d472f569ca63860fd6dfd6b915ef3 /pbx.c
parent3b7e3faceaa7ab3cd0becb4522366023df9a21ed (diff)
Unlock channel on failure so that ast_mutex_destroy doesn't throw a fit (issue #6647 reported by casper)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@17702 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx.c')
-rw-r--r--pbx.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/pbx.c b/pbx.c
index b9662ad3d..96707fad6 100644
--- a/pbx.c
+++ b/pbx.c
@@ -5025,8 +5025,10 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout
} else {
if (ast_pbx_start(chan)) {
ast_log(LOG_ERROR, "Unable to start PBX on %s\n", chan->name);
- if (channel)
+ if (channel) {
*channel = NULL;
+ ast_mutex_unlock(&chan->lock);
+ }
ast_hangup(chan);
res = -1;
}
@@ -5042,13 +5044,15 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout
ast_cdr_failed(chan->cdr);
}
- if (channel)
+ if (channel) {
*channel = NULL;
+ ast_mutex_unlock(&chan->lock);
+ }
ast_hangup(chan);
}
}
- if(res < 0) { /* the call failed for some reason */
+ if (res < 0) { /* the call failed for some reason */
if (*reason == 0) { /* if the call failed (not busy or no answer)
* update the cdr with the failed message */
cdr_res = ast_pbx_outgoing_cdr_failed();
@@ -5107,8 +5111,10 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout
if (ast_pthread_create(&as->p, &attr, async_wait, as)) {
ast_log(LOG_WARNING, "Failed to start async wait\n");
free(as);
- if (channel)
+ if (channel) {
*channel = NULL;
+ ast_mutex_unlock(&chan->lock);
+ }
ast_hangup(chan);
res = -1;
goto outgoing_exten_cleanup;