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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238836 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

@@ -648,7 +648,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
 		peer = chan;
 	}
 
-	if (!play_announcement && !orig_chan_name) {
+	if (peer && (!play_announcement && !orig_chan_name)) {
 		orig_chan_name = ast_strdupa(peer->name);
 	}