From d2ace23248cd389c2a3622fe25a9ae6ec5d2b92f Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Tue, 29 Aug 2017 10:26:17 -0400 Subject: [PATCH] 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 --- apps/app_confbridge.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 */