[svn-commits] jeang: trunk r277945 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jeang
Date: Mon Jul 19 16:07:08 2010
New Revision: 277945

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277945
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=277945&r1=277944&r2=277945
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Mon Jul 19 16:07:08 2010
@@ -3963,7 +3963,7 @@
 
 	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;