diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2008-10-09 19:27:32 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2008-10-09 19:27:32 +0000 |
| commit | c897b4e6307186e3a73d28ad46ec6cd11ae7e543 (patch) | |
| tree | 56c27548657385160b46836c0153d73b2eb31e29 /main | |
| parent | 435653fc05303cf461538b198bb6c2ff0fffc8a7 (diff) | |
(closes issue #13139)
Reported by: krisk84
Tested by: krisk84
This change prevents a call that is placed in the parkinglot to be picked up before the PBX is finished. If another extension dials the parking extension before the PBX thread has completed at minimum warnings will occur about the PBX not properly being terminated. At worst, a crash could occur.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@147952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c index 63bf1952a..988444192 100644 --- a/main/features.c +++ b/main/features.c @@ -2857,6 +2857,10 @@ static int park_exec_full(struct ast_channel *chan, void *data, struct ast_parki AST_LIST_LOCK(&parkinglot->parkings); AST_LIST_TRAVERSE_SAFE_BEGIN(&parkinglot->parkings, pu, list) { if (!data || pu->parkingnum == park) { + if (pu->chan->pbx) { /* do not allow call to be picked up until the PBX thread is finished */ + AST_LIST_UNLOCK(&parkinglot->parkings); + return -1; + } AST_LIST_REMOVE_CURRENT(list); break; } |