sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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: https://origsvn.digium.com/svn/asterisk/trunk@277945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jean Galarneau 2010-07-19 21:07:08 +00:00
parent cb5892bb67
commit e533a48c16
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/features.c
View File

@ -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;