kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 238835 via svnmerge from

Browse Source 
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.1@238837 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-01-08 23:33:56 +00:00
parent 3ad89edcaf
commit 5dcfc56b56
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/features.c
View File

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