diff options
| author | jeang <jeang@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-19 21:21:20 +0000 |
|---|---|---|
| committer | jeang <jeang@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-19 21:21:20 +0000 |
| commit | 217c56898ca7b7a1f41dba61a1e7e26004aafc51 (patch) | |
| tree | 9b07f3db1f9c165f4695fca9cb3e71a3f35e60d1 /main | |
| parent | c1924483f5976a09b74e1aaeb3e20e0ce7df12d0 (diff) | |
Merged revisions 277945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r277945 | jeang | 2010-07-19 16:07:08 -0500 (Mon, 19 Jul 2010) | 15 lines
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/branches/1.6.2@277966 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 260f7f5c9..0668ae657 100644 --- a/main/features.c +++ b/main/features.c @@ -3403,7 +3403,7 @@ 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->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; |