diff options
| author | jeang <jeang@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-19 21:07:08 +0000 |
|---|---|---|
| committer | jeang <jeang@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-19 21:07:08 +0000 |
| commit | d5b23d0bbf1857a6f64226119700d96df8fffdbb (patch) | |
| tree | e75918dd0d4a426a7d43e8fc45803a08923e5b7d /main | |
| parent | af242a2d4fece9ad54ee11517b96a42c9914c5aa (diff) | |
Merged revisions 277906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r277906 | jeang | 2010-07-19 15:16:36 -0500 (Mon, 19 Jul 2010) | 7 lines
Avoid trying to pickup a parked extension before the park operation is completed.
A crash could occur if the extension is picked up while the parking extension is
being announced. Testing pu->notquiteyet while searching for a parked extension
resolves this crash.
(ABE-2418)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@277945 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index eaef42b1f..5b4bc80d6 100644 --- a/main/features.c +++ b/main/features.c @@ -3963,7 +3963,7 @@ static int park_exec_full(struct ast_channel *chan, const char *data, struct ast AST_LIST_LOCK(&parkinglot->parkings); AST_LIST_TRAVERSE_SAFE_BEGIN(&parkinglot->parkings, pu, list) { - if (!data || pu->parkingnum == park) { + if (!pu->notquiteyet && (!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; |