diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-08 23:30:55 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-08 23:30:55 +0000 |
| commit | 090335b824429fb74d507bec532837af8b318607 (patch) | |
| tree | 5da8509443eff6dd1c6d11c1d43c0a4791673749 /main/features.c | |
| parent | e73a979682a3b4c499667dc5e0035dcf15064205 (diff) | |
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/trunk@238835 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -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 423ff27d7..3f2008053 100644 --- a/main/features.c +++ b/main/features.c @@ -991,7 +991,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); } |