kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-20 19:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@33478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-06-11 15:04:26 +00:00
parent 62866c9fda
commit d21d275cc3
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/app_test.c
View File

@@ -100,6 +100,7 @@ static int measurenoise(struct ast_channel *chan, int ms, char *who)
samples++; samples++;
} }
} }
ast_frfree(f);
} }
if (rformat) { if (rformat) {

1
apps/app_zapbarge.c
View File

@@ -212,6 +212,7 @@ zapretry:
break; break;
if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) { if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
ret = 0; ret = 0;
ast_frfree(f);
break; break;
} else if (fd != chan->fds[0]) { } else if (fd != chan->fds[0]) {
if (f->frametype == AST_FRAME_VOICE) { if (f->frametype == AST_FRAME_VOICE) {

2
apps/app_zapscan.c
View File

@@ -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)); ast_log(LOG_WARNING, "Failed to read frame: %s\n", strerror(errno));
} }
} }
if (f)
ast_frfree(f);
if (fd != chan->fds[0]) if (fd != chan->fds[0])
close(fd); close(fd);
else { else {