diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-30 17:33:09 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-30 17:33:09 +0000 |
| commit | 7aaab544c156cd137514534d5c6f195e150014b1 (patch) | |
| tree | 59cd228c9ef9a3bf06c7136fca4a623b28878005 /main | |
| parent | 484461b71db630672a17005c5d8aed77b6614d5c (diff) | |
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.1@231512 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/rtp.c b/main/rtp.c index e024858d0..bcce82104 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; |