fix seg fault (bug #2772)

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

diff --git a/CHANGES b/CHANGES
index a5173694f9cfa974f848b9c5618e90968c1527dc..a205d7ae38f37b7bef7481e97728e24890a99e94 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ -- rtp
+    -- fix for a seg fault
  -- chan_sip
     -- fix to prevent seg fault when attempting a transfer
     -- fix bug with supervised transfers

diff --git a/rtp.c b/rtp.c
index fff3deed0c8eb6aa1dacc11ec3777445772fc60f..dbe67a2401d303926b77c710a11f0e13a8e25392 100755 (executable)
--- a/rtp.c
+++ b/rtp.c
@@ -472,14 +472,14 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
            if (rtp->lasteventseqn <= seqno) {
              f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen);
              rtp->lasteventseqn = seqno;
-           }
+           } else f = NULL;
            if (f) return f; else return &null_frame;
          } else if (rtpPT.code == AST_RTP_CISCO_DTMF) {
            /* It's really special -- process it the Cisco way */
            if (rtp->lasteventseqn <= seqno) {
              f = process_cisco_dtmf(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen);
              rtp->lasteventseqn = seqno;
-           }
+           } else f = NULL;
            if (f) return f; else return &null_frame;
          } else if (rtpPT.code == AST_RTP_CN) {
            /* Comfort Noise */