From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 8 Jan 2010 23:28:37 +0000 (+0000)
Subject: Stop a crash when no peer is passed to masq_park_call.
X-Git-Tag: 1.4.30-rc2~5^2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5be54b36b26ad7f76793a9c7324e6bb94fd30d94;p=thirdparty%2Fasterisk.git

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/branches/1.4@238834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_features.c b/res/res_features.c
index c74c87236c..e5a6179e44 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);
 	}