kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix several crashes in MeetMeAdmin

Browse Source 
This change ensures that MeetMeAdmin commands requiring a user actually
get a user and fixes another issue where an extra dereference could
occur for a last-entered user being ejected if a user identifier was
also provided.

(closes issue ASTERISK-21907)
Reported by: Alex Epshteyn
Review: https://reviewboard.asterisk.org/r/2844/
........

Merged revisions 399033 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 399034 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 399035 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2013-09-13 14:17:15 +00:00
parent fc09e5eb66
commit 0ffcd11380
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
apps/app_meetme.c
View File

@@ -5253,6 +5253,23 @@ static int admin_exec(struct ast_channel *chan, const char *data) {
res = -2;
goto usernotfound;
}
} else {
/* fail for commands that require a user */
switch (*args.command) {
case 'm': /* Unmute */
case 'M': /* Mute */
case 't': /* Lower user's talk volume */
case 'T': /* Raise user's talk volume */
case 'u': /* Lower user's listen volume */
case 'U': /* Raise user's listen volume */
case 'r': /* Reset user's volume level */
case 'k': /* Kick user */
res = -2;
ast_log(LOG_NOTICE, "No user specified!\n");
goto usernotfound;
default:
break;
}
}
switch (*args.command) {
@@ -5268,21 +5285,22 @@ static int admin_exec(struct ast_channel *chan, const char *data) {
case 101: /* e: Eject last user*/
{
int max_no = 0;
/* If they passed in a user, disregard it */
if (user) {
ao2_ref(user, -1);
}
RAII_VAR(struct ast_conf_user *, eject_user, NULL, ao2_cleanup);
ao2_callback(cnf->usercontainer, OBJ_NODATA, user_max_cmp, &max_no);
user = ao2_find(cnf->usercontainer, &max_no, 0);
if (!ast_test_flag64(&user->userflags, CONFFLAG_ADMIN))
user->adminflags |= ADMINFLAG_KICKME;
else {
eject_user = ao2_find(cnf->usercontainer, &max_no, 0);
if (!eject_user) {
res = -1;
ast_log(LOG_NOTICE, "No last user to kick!\n");
break;
}
if (!ast_test_flag64(&eject_user->userflags, CONFFLAG_ADMIN)) {
eject_user->adminflags |= ADMINFLAG_KICKME;
} else {
res = -1;
ast_log(LOG_NOTICE, "Not kicking last user, is an Admin!\n");
}
ao2_ref(user, -1);
break;
}
case 77: /* M: Mute */