From cde1057ec3dbecf97f6b7de2f2ea03b33d5175ee Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 8 Jan 2010 23:30:55 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@238835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/features.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/features.c b/main/features.c
index 423ff27d75..3f2008053c 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);
}
--
GitLab