[svn-commits] file: branch 1.4 r228409 - /branches/1.4/main/abstract_jb.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Nov  6 10:41:20 2009
New Revision: 228409

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228409
Log:
Fix a bug caused by a partially invalid frame (from the jitterbuffer) passing through the Asterisk core.

(closes issue #15560)
Reported by: jvandal
(closes issue #15709)
Reported by: covici

Modified:
    branches/1.4/main/abstract_jb.c

Modified: branches/1.4/main/abstract_jb.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/abstract_jb.c?view=diff&rev=228409&r1=228408&r2=228409
==============================================================================
--- branches/1.4/main/abstract_jb.c (original)
+++ branches/1.4/main/abstract_jb.c Fri Nov  6 10:41:20 2009
@@ -389,7 +389,7 @@
 	struct ast_jb *jb = &chan->jb;
 	struct ast_jb_impl *jbimpl = jb->impl;
 	void *jbobj = jb->jbobj;
-	struct ast_frame *f, finterp;
+	struct ast_frame *f, finterp = { .frametype = AST_FRAME_VOICE, };
 	long now;
 	int interpolation_len, res;
 	
@@ -418,13 +418,9 @@
 		case JB_IMPL_INTERP:
 			/* interpolate a frame */
 			f = &finterp;
-			f->frametype = AST_FRAME_VOICE;
 			f->subclass = jb->last_format;
-			f->datalen  = 0;
 			f->samples  = interpolation_len * 8;
-			f->mallocd  = 0;
 			f->src  = "JB interpolation";
-			f->data  = NULL;
 			f->delivery = ast_tvadd(jb->timebase, ast_samp2tv(jb->next, 1000));
 			f->offset = AST_FRIENDLY_OFFSET;
 			/* deliver the interpolated frame */