From: Joshua Colp <jcolp@digium.com>
Date: Fri, 6 Nov 2009 16:41:20 +0000 (+0000)
Subject: Fix a bug caused by a partially invalid frame (from the jitterbuffer) passing through... 
X-Git-Tag: 1.4.27-rc3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e10834b22bdc4e819782476b6fff2e3e64511c6;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@228409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index 226df462ba..ecc5e8cde4 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -389,7 +389,7 @@ static void jb_get_and_deliver(struct ast_channel *chan)
 	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 @@ static void jb_get_and_deliver(struct ast_channel *chan)
 		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 */