kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-30 20:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix up five little places where frames would not be free'd and remove an

Browse Source 
unnecessary mutex_unlock where there is no way for it to be locked at
that time


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@33545 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-06-11 21:08:04 +00:00
parent 332880b8bc
commit dcebecb76e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/app_meetme.c
+7 -2
View File
@@ -1327,16 +1327,19 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
tmp[1] = '\0';
if (!ast_goto_if_exists(chan, exitcontext, tmp, 1)) {
ret = 0;
ast_frfree(f);
break;
} else if (option_debug > 1)
ast_log(LOG_DEBUG, "Exit by single digit did not work in meetme. Extension %s does not exist in context %s\n", tmp, exitcontext);
} else if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#') && (confflags & CONFFLAG_POUNDEXIT)) {
ret = 0;
ast_frfree(f);
break;
} else if (((f->frametype == AST_FRAME_DTMF) && (f->subclass == '*') && (confflags & CONFFLAG_STARMENU)) || ((f->frametype == AST_FRAME_DTMF) && menu_active)) {
if (ioctl(fd, ZT_SETCONF, &ztc_empty)) {
ast_log(LOG_WARNING, "Error setting conference\n");
close(fd);
ast_frfree(f);
goto outrun;
}
@@ -1494,7 +1497,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference\n");
close(fd);
ast_mutex_unlock(&conflock);
ast_frfree(f);
goto outrun;
}
@@ -2174,8 +2177,10 @@ static void *recordthread(void *args)
}
if (f->frametype == AST_FRAME_VOICE) {
res = ast_writestream(s, f);
if (res)
if (res) {
ast_frfree(f);
break;
}
}
ast_frfree(f);
if (cnf->recording == MEETME_RECORD_TERMINATE) {