aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-11 15:04:26 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-11 15:04:26 +0000
commitac8dc127f90272450c43e7c53ac041e2c096aec3 (patch)
tree0dc3f704c0ca52c4a642d7d924233b9c786d52a9 /apps
parent9b6cf45120a38c6251a4c7c1f6f78e69575e9d32 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33478 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_test.c1
-rw-r--r--apps/app_zapbarge.c1
-rw-r--r--apps/app_zapscan.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_test.c b/apps/app_test.c
index dba8bcafb..bb3c0031e 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -100,6 +100,7 @@ static int measurenoise(struct ast_channel *chan, int ms, char *who)
samples++;
}
}
+ ast_frfree(f);
}
if (rformat) {
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 {