kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't dereference consumed frame delivery.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-04-20 15:28:58 +00:00
parent ef89a2709a
commit 8f86c8409d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
translate.c
View File

@@ -137,6 +137,7 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
{ {
struct ast_trans_pvt *p; struct ast_trans_pvt *p;
struct ast_frame *out; struct ast_frame *out;
struct timeval delivery;
p = path; p = path;
/* Feed the first frame into the first translator */ /* Feed the first frame into the first translator */
p->step->framein(p->state, f); p->step->framein(p->state, f);
@@ -179,6 +180,8 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
path->nextin.tv_sec++; path->nextin.tv_sec++;
} }
} }
delivery.tv_sec = f->delivery.tv_sec;
delivery.tv_usec = f->delivery.tv_usec;
if (consume) if (consume)
ast_frfree(f); ast_frfree(f);
while(p) { while(p) {
@@ -191,7 +194,7 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
if (p->next) if (p->next)
p->next->step->framein(p->next->state, out); p->next->step->framein(p->next->state, out);
else { else {
if (f->delivery.tv_sec || f->delivery.tv_usec) { if (delivery.tv_sec || delivery.tv_usec) {
/* Use next predicted outgoing timestamp */ /* Use next predicted outgoing timestamp */
out->delivery.tv_sec = path->nextout.tv_sec; out->delivery.tv_sec = path->nextout.tv_sec;
out->delivery.tv_usec = path->nextout.tv_usec; out->delivery.tv_usec = path->nextout.tv_usec;