automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@33575 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 92a945525efca6b8dc6cce71cac5330ec1d8f3b7..72f90d8e19a4939f616d3fb4828542c30e43df94 100644 (file)
--- 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 ee00f3a47360316d187b45bed23d209916d36755..4f71fc5c15d1b990a6bd49bd8e662ec619d38df6 100644 (file)
--- 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);
        }