[svn-commits] jeang: branch 1.4 r277906 - /branches/1.4/res/res_features.c

SVN commits to the Digium repositories svn-commits at lists.digium.com
Mon Jul 19 15:16:40 CDT 2010


Author: jeang
Date: Mon Jul 19 15:16:36 2010
New Revision: 277906

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277906
Log:
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.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_features.c?view=diff&rev=277906&r1=277905&r2=277906
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Mon Jul 19 15:16:36 2010
@@ -2535,7 +2535,7 @@
 	ast_mutex_lock(&parking_lock);
 	pu = parkinglot;
 	while(pu) {
-		if (pu->parkingnum == park) {
+		if (pu->parkingnum == park && !pu->notquiteyet) {
 			if (pu->chan->pbx) { /* do not allow call to be picked up until the PBX thread is finished */
 				ast_mutex_unlock(&parking_lock);
 				ast_module_user_remove(u);




More information about the svn-commits mailing list