[svn-commits] twilson: branch 1.4 r160390 - /branches/1.4/res/res_features.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Dec  2 17:04:23 2008
New Revision: 160390

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160390
Log:
A situation like A calls B, A builtin_atxfers B to C, C parks B would lead to a crash.  Thanks to file for telling me how to fix it!

(closes issue #13854)
Reported by: Adam Lee
Tested by: otherwiseguy

Modified:
    branches/1.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=160390&r1=160389&r2=160390
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Tue Dec  2 17:04:23 2008
@@ -752,7 +752,7 @@
 		res = finishup(transferee);
 		if (res)
 			res = -1;
-		else if (!ast_park_call(transferee, transferer, 0, NULL)) {	/* success */
+		else if (!masq_park_call_announce(transferee, transferer, 0, NULL)) {	/* success */
 			/* We return non-zero, but tell the PBX not to hang the channel when
 			   the thread dies -- We have to be careful now though.  We are responsible for 
 			   hanging up the channel, else it will never be hung up! */