From 8aa9a0e17f131145cddbd202f9203b8509a916a4 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Sun, 11 Jun 2006 22:04:09 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@33575 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 9 +++++++-- pbx.c | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 92a945525e..72f90d8e19 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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) { diff --git a/pbx.c b/pbx.c index ee00f3a473..4f71fc5c15 100644 --- a/pbx.c +++ b/pbx.c @@ -4908,8 +4908,10 @@ static void *async_wait(void *data) break; if (f->frametype == AST_FRAME_CONTROL) { if ((f->subclass == AST_CONTROL_BUSY) || - (f->subclass == AST_CONTROL_CONGESTION) ) - break; + (f->subclass == AST_CONTROL_CONGESTION) ) { + ast_frfree(f); + break; + } } ast_frfree(f); } -- 2.47.2