[asterisk-commits] jpeeler: trunk r238835 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Jan  8 17:30:55 2010
New Revision: 238835

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238835
Log:
Merged revisions 238834 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r238834 | jpeeler | 2010-01-08 17:28:37 -0600 (Fri, 08 Jan 2010) | 4 lines
  
  Stop a crash when no peer is passed to masq_park_call.
  
  (distantly related to issue #16406)
........

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=238835&r1=238834&r2=238835
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Fri Jan  8 17:30:55 2010
@@ -991,7 +991,7 @@
 		peer = chan;
 	}
 
-	if (!play_announcement && args == &park_args) {
+	if (peer && (!play_announcement && args == &park_args)) {
 		args->orig_chan_name = ast_strdupa(peer->name);
 	}