diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-09-13 14:17:15 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-09-13 14:17:15 +0000 |
| commit | 0ffcd11380b1c966ee26b5ea2c319e023bc0cd7f (patch) | |
| tree | f6f73ec70d5e5f12ee438a02f3afe2fef144081f /apps/app_meetme.c | |
| parent | fc09e5eb66ffd6541b30a65b6fc37a88d340ea55 (diff) | |
Fix several crashes in MeetMeAdmin
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
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a3e551e07..e1fedb47b 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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; + RAII_VAR(struct ast_conf_user *, eject_user, NULL, ao2_cleanup); - /* If they passed in a user, disregard it */ - if (user) { - ao2_ref(user, -1); + ao2_callback(cnf->usercontainer, OBJ_NODATA, user_max_cmp, &max_no); + 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; } - 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 { + 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 */ |