From: Jean Galarneau <jgalarneau@digium.com>
Date: Mon, 19 Jul 2010 21:07:08 +0000 (+0000)
Subject: Merged revisions 277906 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2612
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e533a48c16fe1ee80f46b2caf4056478a7702061;p=thirdparty%2Fasterisk.git

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

diff --git a/main/features.c b/main/features.c
index eaef42b1f6..5b4bc80d6f 100644
--- a/main/features.c
+++ b/main/features.c
@@ -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;