From 522ef2e42d80237728e1f5cb28085ab40a820d1e Mon Sep 17 00:00:00 2001 From: dvossel Date: Fri, 6 Nov 2009 17:09:37 +0000 Subject: Merged revisions 228420 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r228420 | dvossel | 2009-11-06 11:09:01 -0600 (Fri, 06 Nov 2009) | 19 lines Merged revisions 228418 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r228418 | dvossel | 2009-11-06 11:07:13 -0600 (Fri, 06 Nov 2009) | 13 lines fixes segfault in iLBC For reasons not yet known, it appears possible for an ast_frame to have a datalen greater than zero while the actual data is NULL during Packet Loss Concealment. Most codecs don't support PLC so this doesn't affect them. This patch catches the malformed frame and prevents the crash from occuring. Additional efforts to determine why it is possible for a frame to look like this are still being investigated. (issue #16979) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@228421 f38db490-d61c-443f-a65b-d21fe96a405b --- codecs/codec_ilbc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index c01b2f740..f7665649d 100644 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -88,6 +88,11 @@ static int ilbctolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) int16_t *dst = pvt->outbuf.i16; float tmpf[ILBC_SAMPLES]; + if (!f->data && f->datalen) { + ast_log(LOG_DEBUG, "issue 16070, ILIB ERROR. data = NULL datalen = %d src = %s\n", f->datalen, f->src ? f->src : "no src set"); + f->datalen = 0; + } + if (f->datalen == 0) { /* native PLC, set fake f->datalen and clear plc_mode */ f->datalen = ILBC_FRAME_LEN; f->samples = ILBC_SAMPLES; -- cgit v1.2.3