aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-08 23:28:37 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-08 23:28:37 +0000
commit1278d7a94507f40f7c824074c7955f09528ed75f (patch)
tree4b5645d9419f0496f774c07474dcb8e04b0528d6 /res
parent9bfa8fb1e242c6f5550b8f5f3a1eb7e67cc04cbc (diff)
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.4@238834 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_features.c b/res/res_features.c
index c74c87236..e5a6179e4 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -590,7 +590,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)) {
/* chan is the channel being parked, peer is the effective park-er */
orig_chan_name = ast_strdupa(peer->name);
}