From: Automerge script <automerge@asterisk.org>
Date: Sun, 11 Jun 2006 15:04:26 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.10-netsec~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d21d275cc3ad0797516e2a7490f17d2ed8950e3f;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/apps/app_test.c b/apps/app_test.c
index dba8bcafb2..bb3c0031e9 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 10c5c49e5f..9fea023edc 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 ed0c779772..3b284ed80a 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 {