From: Jason Parker Date: Mon, 3 Dec 2007 20:58:26 +0000 (+0000) Subject: Merged revisions 90607 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~580 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63342693aea22854672615bdf01cf4b18b8aa730;p=thirdparty%2Fasterisk.git Merged revisions 90607 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 (Closes issue #11436) ........ r90607 | qwell | 2007-12-03 14:51:17 -0600 (Mon, 03 Dec 2007) | 4 lines Fix crash in ParkAndAnnounce application. Issue #11436, reported by lytledd, patch by eliel. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90631 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_features.c b/res/res_features.c index 3deb1bc6a2..b15c7064ed 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -492,7 +492,7 @@ static int park_call_full(struct ast_channel *chan, struct ast_channel *peer, in if (!con) /* Still no context? Bad */ ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con); /* Tell the peer channel the number of the parking space */ - if ((peer && pu->parkingnum != -1 && ast_strlen_zero(orig_chan_name)) || !strcasecmp(peer->name, orig_chan_name)) { /* Only say number if it's a number and the channel hasn't been masqueraded away */ + if (peer && ((pu->parkingnum != -1 && ast_strlen_zero(orig_chan_name)) || !strcasecmp(peer->name, orig_chan_name))) { /* Only say number if it's a number and the channel hasn't been masqueraded away */ /* Make sure we don't start saying digits to the channel being parked */ ast_set_flag(peer, AST_FLAG_MASQ_NOSTREAM); ast_say_digits(peer, pu->parkingnum, "", peer->language);