From: Sean Bright <sean.bright@gmail.com>
Date: Tue, 29 Aug 2017 14:26:17 +0000 (-0400)
Subject: confbridge: Handle user hangup during name recording
X-Git-Tag: 13.18.0-rc1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2ace23248cd389c2a3622fe25a9ae6ec5d2b92f;p=thirdparty%2Fasterisk.git

confbridge: Handle user hangup during name recording

This prevents orphaned CBAnn channels from getting stuck in the bridge.

ASTERISK-26994 #close
Reported by: James Terhune

Change-Id: I5e43e832a9507ec3f2c59752cd900b41dab80457
---

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index f95aaaf560..3ea336a84c 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -2317,7 +2317,11 @@ static int confbridge_exec(struct ast_channel *chan, const char *data)
 	if (!quiet &&
 		(ast_test_flag(&user.u_profile, USER_OPT_ANNOUNCE_JOIN_LEAVE) ||
 		(ast_test_flag(&user.u_profile, USER_OPT_ANNOUNCE_JOIN_LEAVE_REVIEW)))) {
-		conf_rec_name(&user, args.conf_name);
+		if (conf_rec_name(&user, args.conf_name)) {
+			pbx_builtin_setvar_helper(chan, "CONFBRIDGE_RESULT", "FAILED");
+			res = -1; /* Hangup during name recording */
+			goto confbridge_cleanup;
+		}
 	}
 
 	/* menu name */