From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 12 Nov 2004 14:29:15 +0000 (+0000)
Subject: fix seg fault (bug #2772)
X-Git-Tag: 1.0.11.1~386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbf6ad2ecd9e8cfeb7c2034002fff3af155203ab;p=thirdparty%2Fasterisk.git

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 a5173694f9..a205d7ae38 100755
--- 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 fff3deed0c..dbe67a2401 100755
--- 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 */