[asterisk-commits] kmoore: trunk r379721 - in /trunk: ./ codecs/codec_ilbc.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon Jan 21 12:47:47 2013
New Revision: 379721

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379721
Log:
Prevent segfault for interpolated iLBC frames

When iLBC is being used with a jitter buffer and the jb has to
interpolate frames, it generates frames with a null pointer and a
non-zero datalen. This is now be handled properly.

(closes issue ASTERISK-20914)
Reported By: John McEleney
Patches:
  ASTERISK-20914-1.8.diff uploaded by Matt Jordan (license 6283)
........

Merged revisions 379718 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 379719 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/codecs/codec_ilbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/codecs/codec_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/codecs/codec_ilbc.c?view=diff&rev=379721&r1=379720&r2=379721
==============================================================================
--- trunk/codecs/codec_ilbc.c (original)
+++ trunk/codecs/codec_ilbc.c Mon Jan 21 12:47:47 2013
@@ -96,27 +96,29 @@
 	/* Assuming there's space left, decode into the current buffer at
 	   the tail location.  Read in as many frames as there are */
 	int x,i;
+	int datalen = f->datalen;
 	int16_t *dst = pvt->outbuf.i16;
 	ilbc_block tmpf[ILBC_SAMPLES];
 
-	if (!f->data.ptr && f->datalen) {
-		ast_debug(1, "issue 16070, ILIB ERROR. data = NULL datalen = %d src = %s\n", f->datalen, f->src ? f->src : "no src set");
+	if (!f->data.ptr && datalen) {
+		ast_debug(1, "issue 16070, ILIB ERROR. data = NULL datalen = %d src = %s\n", 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;
+		datalen = 0;
+	}
+
+	if (datalen == 0) { /* native PLC, set fake datalen and clear plc_mode */
+		datalen = ILBC_FRAME_LEN;
 		f->samples = ILBC_SAMPLES;
 		plc_mode = 0;	/* do native plc */
 		pvt->samples += ILBC_SAMPLES;
 	}
 
-	if (f->datalen % ILBC_FRAME_LEN) {
-		ast_log(LOG_WARNING, "Huh?  An ilbc frame that isn't a multiple of 50 bytes long from %s (%d)?\n", f->src, f->datalen);
+	if (datalen % ILBC_FRAME_LEN) {
+		ast_log(LOG_WARNING, "Huh?  An ilbc frame that isn't a multiple of 50 bytes long from %s (%d)?\n", f->src, datalen);
 		return -1;
 	}
 
-	for (x=0; x < f->datalen ; x += ILBC_FRAME_LEN) {
+	for (x=0; x < datalen ; x += ILBC_FRAME_LEN) {
 		if (pvt->samples + ILBC_SAMPLES > BUFFER_SAMPLES) {
 			ast_log(LOG_WARNING, "Out of buffer space\n");
 			return -1;