From: Joshua Colp <jcolp@digium.com>
Date: Fri, 15 Nov 2019 10:46:37 +0000 (-0400)
Subject: parking: Fix case where we can't get the parker.
X-Git-Tag: 17.1.0-rc1~26^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de433cdcaf64070164300a51ab8ab0d0c596c71e;p=thirdparty%2Fasterisk.git

parking: Fix case where we can't get the parker.

ASTERISK-28616

Change-Id: Iabe31ae38d01604284fcc5c2438d44e29a32ea4d
---

diff --git a/res/parking/parking_bridge.c b/res/parking/parking_bridge.c
index 51cdfd2a04..b92a44b249 100644
--- a/res/parking/parking_bridge.c
+++ b/res/parking/parking_bridge.c
@@ -273,8 +273,10 @@ static int bridge_parking_push(struct ast_bridge_parking *self, struct ast_bridg
 	blind_transfer = pbx_builtin_getvar_helper(bridge_channel->chan, "BLINDTRANSFER");
 	blind_transfer = ast_strdupa(S_OR(blind_transfer, ""));
 	ast_channel_unlock(bridge_channel->chan);
-	if ((!parker || !strcmp(parker->base->name, ast_channel_name(bridge_channel->chan)))
-		&& !ast_strlen_zero(blind_transfer)) {
+	if (!parker || !strcmp(parker->base->name, ast_channel_name(bridge_channel->chan))) {
+		/* Even if there is no BLINDTRANSFER dialplan variable then blind_transfer will
+		 * be an empty string.
+		 */
 		parker_channel_name = blind_transfer;
 	} else {
 		parker_channel_name = parker->base->name;