aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-11 21:04:25 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-11 21:04:25 +0000
commitc7a31927824fe48c7f946de1cd5d0f2c61ca5d0e (patch)
treec7dfc4263d4466233160d934bddeb86fd27bfbcb /apps
parentd536edee4e6f85f263badf87e570a93528252d15 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33544 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_alarmreceiver.c2
-rw-r--r--apps/app_festival.c2
-rw-r--r--apps/app_ices.c1
3 files changed, 5 insertions, 0 deletions
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 95abe1439..ae564d841 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -215,6 +215,7 @@ static int send_tone_burst(struct ast_channel *chan, float freq, int duration, i
i += wf.datalen / 8;
if (i > duration) {
+ ast_frfree(f);
break;
}
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_log(LOG_WARNING, "AlarmReceiver Failed to write frame on %s\n",chan->name);
res = -1;
+ ast_frfree(f);
break;
}
}
diff --git a/apps/app_festival.c b/apps/app_festival.c
index de1830fd2..3906d604a 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -234,11 +234,13 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in
myf.f.data = myf.frdata;
if (ast_write(chan, &myf.f) < 0) {
res = -1;
+ ast_frfree(f);
break;
}
if (res < needed) { /* last frame */
ast_log(LOG_DEBUG, "Last frame\n");
res=0;
+ ast_frfree(f);
break;
}
} else {
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 85f4159ec..b6b5ad3f7 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -175,6 +175,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
if (errno != EAGAIN) {
ast_log(LOG_WARNING, "Write failed to pipe: %s\n", strerror(errno));
res = -1;
+ ast_frfree(f);
break;
}
}