kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_confbridge: Fix NULL check in action_kick_last."

Browse Source
This commit is contained in:
Joshua Colp
2018-01-10 09:08:27 -06:00
committed by Gerrit Code Review
parent 342e3a97c3 5380fb9978
commit 92ff6c6598
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_confbridge.c
View File

@@ -2689,17 +2689,23 @@ static int action_kick_last(struct confbridge_conference *conference,
}
ao2_lock(conference);
if (((last_user = AST_LIST_LAST(&conference->active_list)) == user)
|| (ast_test_flag(&last_user->u_profile, USER_OPT_ADMIN))) {
last_user = AST_LIST_LAST(&conference->active_list);
if (!last_user) {
ao2_unlock(conference);
return 0;
}
if (last_user == user || ast_test_flag(&last_user->u_profile, USER_OPT_ADMIN)) {
ao2_unlock(conference);
play_file(bridge_channel, NULL,
conf_get_sound(CONF_SOUND_ERROR_MENU, conference->b_profile.sounds));
} else if (last_user && !last_user->kicked) {
} else if (!last_user->kicked) {
last_user->kicked = 1;
pbx_builtin_setvar_helper(last_user->chan, "CONFBRIDGE_RESULT", "KICKED");
ast_bridge_remove(conference->bridge, last_user->chan);
ao2_unlock(conference);
}
return 0;
}