[Asterisk-cvs] asterisk translate.c,1.21,1.22

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv11428

Modified Files:
	translate.c 
Log Message:
Don't dereference consumed frame delivery.


Index: translate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/translate.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- translate.c	5 Apr 2004 20:47:44 -0000	1.21
+++ translate.c	20 Apr 2004 15:28:58 -0000	1.22
@@ -137,6 +137,7 @@
 {
 	struct ast_trans_pvt *p;
 	struct ast_frame *out;
+	struct timeval delivery;
 	p = path;
 	/* Feed the first frame into the first translator */
 	p->step->framein(p->state, f);
@@ -179,6 +180,8 @@
 			path->nextin.tv_sec++;
 		}
 	}
+	delivery.tv_sec = f->delivery.tv_sec;
+	delivery.tv_usec = f->delivery.tv_usec;
 	if (consume)
 		ast_frfree(f);
 	while(p) {
@@ -191,7 +194,7 @@
 		if (p->next) 
 			p->next->step->framein(p->next->state, out);
 		else {
-			if (f->delivery.tv_sec || f->delivery.tv_usec) {
+			if (delivery.tv_sec || delivery.tv_usec) {
 				/* Use next predicted outgoing timestamp */
 				out->delivery.tv_sec = path->nextout.tv_sec;
 				out->delivery.tv_usec = path->nextout.tv_usec;