aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-11 14:56:55 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-11 14:56:55 +0000
commit9d45bc87ffc8eee12f0e6b178558dada309f72d5 (patch)
tree130f19a47e947cff7576bba51ca985ca6e8783f1
parent5c2c23c9843a91630beba2661c0edf040453ecde (diff)
backport a couple of frame leak fixes from the trunk (revisions 33446, 33447)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@33449 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_zapbarge.c1
-rw-r--r--apps/app_zapscan.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 10c5c49e5..9fea023ed 100644
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -212,6 +212,7 @@ zapretry:
break;
if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
ret = 0;
+ ast_frfree(f);
break;
} else if (fd != chan->fds[0]) {
if (f->frametype == AST_FRAME_VOICE) {
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index ed0c77977..3b284ed80 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -269,6 +269,8 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags)
ast_log(LOG_WARNING, "Failed to read frame: %s\n", strerror(errno));
}
}
+ if (f)
+ ast_frfree(f);
if (fd != chan->fds[0])
close(fd);
else {