kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +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@33544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-06-11 21:04:25 +00:00
parent fae968612e
commit 9de1f31bbc
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_alarmreceiver.c
View File

@@ -215,6 +215,7 @@ static int send_tone_burst(struct ast_channel *chan, float freq, int duration, i
i += wf.datalen / 8; i += wf.datalen / 8;
if (i > duration) { if (i > duration) {
ast_frfree(f);
break; break;
} }
if (ast_write(chan, &wf)){ if (ast_write(chan, &wf)){
@@ -222,6 +223,7 @@ static int send_tone_burst(struct ast_channel *chan, float freq, int duration, i
ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Failed to write frame on %s\n", chan->name); ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Failed to write frame on %s\n", chan->name);
ast_log(LOG_WARNING, "AlarmReceiver Failed to write frame on %s\n",chan->name); ast_log(LOG_WARNING, "AlarmReceiver Failed to write frame on %s\n",chan->name);
res = -1; res = -1;
ast_frfree(f);
break; break;
} }
} }

2
apps/app_festival.c
View File

@@ -234,11 +234,13 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in
myf.f.data = myf.frdata; myf.f.data = myf.frdata;
if (ast_write(chan, &myf.f) < 0) { if (ast_write(chan, &myf.f) < 0) {
res = -1; res = -1;
ast_frfree(f);
break; break;
} }
if (res < needed) { /* last frame */ if (res < needed) { /* last frame */
ast_log(LOG_DEBUG, "Last frame\n"); ast_log(LOG_DEBUG, "Last frame\n");
res=0; res=0;
ast_frfree(f);
break; break;
} }
} else { } else {

1
apps/app_ices.c
View File

@@ -175,6 +175,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
if (errno != EAGAIN) { if (errno != EAGAIN) {
ast_log(LOG_WARNING, "Write failed to pipe: %s\n", strerror(errno)); ast_log(LOG_WARNING, "Write failed to pipe: %s\n", strerror(errno));
res = -1; res = -1;
ast_frfree(f);
break; break;
} }
} }