aboutsummaryrefslogtreecommitdiffstats
path: root/main/features.c
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-02-12 18:00:49 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2009-02-12 18:00:49 +0000
commitb3e0404da02b21a9f77ce3410eab16f1eae31ae1 (patch)
tree07ff3507b6e0e2d73e94dc1d67c49c8ffaf8a896 /main/features.c
parent8756c72e7908c07edabc2ddfde58b6291d09a07d (diff)
Merged revisions 175188 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r175188 | jpeeler | 2009-02-12 12:00:11 -0600 (Thu, 12 Feb 2009) | 12 lines Merged revisions 175187 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r175187 | jpeeler | 2009-02-12 11:57:10 -0600 (Thu, 12 Feb 2009) | 6 lines Fix crash in event of failed attempt to transfer to parking The peer may not necessarily exist, such as in the case of a transfer to ParkAndAnnounce. In this case don't try to play a sound to it. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@175189 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c
index 94161626e..b1b6e8409 100644
--- a/main/features.c
+++ b/main/features.c
@@ -614,7 +614,8 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
int park_status;
if ((pu = park_space_reserve(rchan)) == NULL) {
- ast_stream_and_wait(peer, "beeperr", "");
+ if (peer)
+ ast_stream_and_wait(peer, "beeperr", "");
return FEATURE_RETURN_PARKFAILED;
}