kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 03:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue #5787

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-11-21 02:03:23 +00:00
parent ca9633ca9b
commit 9ee13167bb
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2005-11-20 Russell Bryant <russell@digium.com> 2005-11-20 Russell Bryant <russell@digium.com>
* apps/app_record.c: Don't leak a frame if writing it to the file fails. (issue #5787)
* Makefile: Create the monitor spool directory when the other spool directories are created.
* channels/chan_sip.c channels/chan_iax2.c: Change warning messages about the number of scheduled events happening all at once to debug messages. (issue #5794) * channels/chan_sip.c channels/chan_iax2.c: Change warning messages about the number of scheduled events happening all at once to debug messages. (issue #5794)
* pbx/pbx_spool.c: Fix crash when a value is not specified with a variable on a Set: line in a call file. (issue #5806) * pbx/pbx_spool.c: Fix crash when a value is not specified with a variable on a Set: line in a call file. (issue #5806)

1
Makefile
View File

@@ -636,6 +636,7 @@ bininstall: all
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi

8
apps/app_record.c
View File

@@ -277,6 +277,7 @@ static int record_exec(struct ast_channel *chan, void *data)
if (res) { if (res) {
ast_log(LOG_WARNING, "Problem writing frame\n"); ast_log(LOG_WARNING, "Problem writing frame\n");
ast_frfree(f);
break; break;
} }
@@ -295,16 +296,15 @@ static int record_exec(struct ast_channel *chan, void *data)
break; break;
} }
} }
} } else if (f->frametype == AST_FRAME_VIDEO) {
if (f->frametype == AST_FRAME_VIDEO) {
res = ast_writestream(s, f); res = ast_writestream(s, f);
if (res) { if (res) {
ast_log(LOG_WARNING, "Problem writing frame\n"); ast_log(LOG_WARNING, "Problem writing frame\n");
ast_frfree(f);
break; break;
} }
} } else if ((f->frametype == AST_FRAME_DTMF) &&
if ((f->frametype == AST_FRAME_DTMF) &&
(f->subclass == terminator)) { (f->subclass == terminator)) {
ast_frfree(f); ast_frfree(f);
break; break;