From cf87d81e9db09711309898dee5192db503523534 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Mon, 30 Nov 2009 17:28:28 +0000 Subject: 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/trunk@231491 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_rtp_asterisk.c | 1 - 1 file changed, 1 deletion(-) (limited to 'res/res_rtp_asterisk.c') diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 80e29f3b0..f833637d8 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1530,7 +1530,6 @@ static struct ast_frame *process_cn_rfc3389(struct ast_rtp_instance *instance, u } rtp->f.frametype = AST_FRAME_CNG; rtp->f.subclass.integer = data[0] & 0x7f; - rtp->f.datalen = len - 1; rtp->f.samples = 0; rtp->f.delivery.tv_usec = rtp->f.delivery.tv_sec = 0; -- cgit v1.2.3