diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-08 23:33:17 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-08 23:33:17 +0000 |
| commit | a6d2f0e5cfa8372452e25b83f44dc857cbcf69cf (patch) | |
| tree | 3d2b42d8000ee94a05b762043aa46a2c5c48e26a /main/features.c | |
| parent | 8bb8bb1908f5179b7569cb9a4ef8fe1a511d5ba8 (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.0@238836 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 283c1805f..9dda36de6 100644 --- a/main/features.c +++ b/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); } |