From: David Vossel <dvossel@digium.com>
Date: Mon, 30 Nov 2009 17:33:09 +0000 (+0000)
Subject: Merged revisions 231491 via svnmerge from
X-Git-Tag: 1.6.1.12-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6955be6794c52ec4c5c5d3f6bfe9919c7268a635;p=thirdparty%2Fasterisk.git

Merged revisions 231491 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r231491 | dvossel | 2009-11-30 11:28:28 -0600 (Mon, 30 Nov 2009) | 17 lines

  Merged revisions 231441 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r231441 | dvossel | 2009-11-30 11:14:08 -0600 (Mon, 30 Nov 2009) | 11 lines

    fixes crash caused by RTP comfort noise payload greater than 24 bytes

    AST-2009-010

    (closes issue #16242)
    Reported by: amorsen
    Patches:
          issue16242.diff uploaded by oej (license 306)
    Tested by: amorsen, oej, dvossel
  ........
................


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

diff --git a/main/rtp.c b/main/rtp.c
index e024858d0b..bcce821041 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1153,7 +1153,6 @@ static struct ast_frame *process_rfc3389(struct ast_rtp *rtp, unsigned char *dat
 	}
 	rtp->f.frametype = AST_FRAME_CNG;
 	rtp->f.subclass = data[0] & 0x7f;
-	rtp->f.datalen = len - 1;
 	rtp->f.samples = 0;
 	rtp->f.delivery.tv_usec = rtp->f.delivery.tv_sec = 0;
 	f = &rtp->f;