kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 22:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_confbridge: Fix ref leak in CLI "confbridge kick" command.

Browse Source 
Fixed ref leak in the CLI "confbridge kick" command when the channel to be
kicked was not in the conference.
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@413452 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-05-07 20:34:58 +00:00
parent 9ca83558ef
commit 5ce91ec687
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_confbridge.c
View File

@@ -2227,6 +2227,7 @@ static char *complete_confbridge_participant(const char *conference_name, const
static char *handle_cli_confbridge_kick(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct confbridge_conference *conference;
int not_found;
switch (cmd) {
case CLI_INIT:
@@ -2254,11 +2255,12 @@ static char *handle_cli_confbridge_kick(struct ast_cli_entry *e, int cmd, struct
ast_cli(a->fd, "No conference bridge named '%s' found!\n", a->argv[2]);
return CLI_SUCCESS;
}
if (kick_conference_participant(conference, a->argv[3])) {
not_found = kick_conference_participant(conference, a->argv[3]);
ao2_ref(conference, -1);
if (not_found) {
ast_cli(a->fd, "No participant named '%s' found!\n", a->argv[3]);
return CLI_SUCCESS;
}
ao2_ref(conference, -1);
ast_cli(a->fd, "Participant '%s' kicked out of conference '%s'\n", a->argv[3], a->argv[2]);
return CLI_SUCCESS;
}
@@ -2892,7 +2894,7 @@ static int action_confbridgekick(struct mansession *s, const struct message *m)
const char *conference_name = astman_get_header(m, "Conference");
const char *channel = astman_get_header(m, "Channel");
struct confbridge_conference *conference;
int found = 0;
int found;
if (ast_strlen_zero(conference_name)) {
astman_send_error(s, m, "No Conference name provided.");