diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-11 22:04:09 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-11 22:04:09 +0000 |
| commit | afb2f1a385132c3b0b8297c3be12e1e2adac20a3 (patch) | |
| tree | 4ab429df820adf69640abe6ed3e836b3bbf8dda6 /apps | |
| parent | c7a31927824fe48c7f946de1cd5d0f2c61ca5d0e (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33575 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 92a945525..72f90d8e1 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) { |