[svn-commits] jpeeler: branch 1.6.1 r238837 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Fri Jan  8 17:33:56 2010
New Revision: 238837

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

................
  r238835 | jpeeler | 2010-01-08 17:30:55 -0600 (Fri, 08 Jan 2010) | 11 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

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

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=238837&r1=238836&r2=238837
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Fri Jan  8 17:33:56 2010
@@ -799,7 +799,7 @@
 		peer = chan;
 	}
 
-	if (!play_announcement && args == &park_args) {
+	if (peer && (!play_announcement && args == &park_args)) {
 		args->orig_chan_name = ast_strdupa(peer->name);
 	}