[svn-commits] jeang: branch 1.6.2 r277966 - in /branches/1.6.2: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jeang
Date: Mon Jul 19 16:21:20 2010
New Revision: 277966

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

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/features.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=277966&r1=277965&r2=277966
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Mon Jul 19 16:21:20 2010
@@ -3403,7 +3403,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;