aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-06 17:10:05 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-06 17:10:05 +0000
commit5bf1926d0369530fc9fcf2e9a1745247c3f23431 (patch)
tree5ba031b678d38e8c2e27af400526581a30af8d53
parent89ea0c1425a255bffe3f2a5a47ec01ee5daab2f5 (diff)
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.1@228422 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--codecs/codec_ilbc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index 4914392a4..d54a1b4ba 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -117,6 +117,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;