diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-08 23:34:31 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-08 23:34:31 +0000 |
commit | c50e575f44d6666a5693d0b9a5fa63869c4ec2bc (patch) | |
tree | f61e0d8f00c6db2614e5a3105c0d7cdda9621e56 /main | |
parent | ba77f4c217b2a1ce4fbb28f2efa1a3abe4f1e904 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@238838 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index 87fb68fc6..6425e61a8 100644 --- a/main/features.c +++ b/main/features.c @@ -868,7 +868,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i peer = chan; } - if (!play_announcement && args == &park_args) { + if (peer && (!play_announcement && args == &park_args)) { args->orig_chan_name = ast_strdupa(peer->name); } |