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.0@231517 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/rtp.c b/main/rtp.c
index 1d66a507904ea9bd9a2c7189269dc7f294c303b6..5cc93248c0e35693101fbe72e8484ba44b2c377b 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1074,7 +1074,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;