From 0bd623a7404327416e1f83f09671ef031c058b06 Mon Sep 17 00:00:00 2001 From: dvossel Date: Mon, 30 Nov 2009 17:31:15 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.2@231505 f38db490-d61c-443f-a65b-d21fe96a405b --- main/rtp.c | 1 - 1 file changed, 1 deletion(-) (limited to 'main') diff --git a/main/rtp.c b/main/rtp.c index 7735e0117..f8c6b5f11 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1147,7 +1147,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; -- cgit v1.2.3