mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 11:58:52 +00:00
automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@33478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -100,6 +100,7 @@ static int measurenoise(struct ast_channel *chan, int ms, char *who)
|
||||
samples++;
|
||||
}
|
||||
}
|
||||
ast_frfree(f);
|
||||
}
|
||||
|
||||
if (rformat) {
|
||||
|
@@ -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) {
|
||||
|
@@ -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 {
|
||||
|
Reference in New Issue
Block a user