From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 30 Jul 2009 14:40:15 +0000 (+0000)
Subject: Merged revisions 209516 via svnmerge from
X-Git-Tag: 1.6.1.5-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eea5e255371237972d2444258cd286211167349;p=thirdparty%2Fasterisk.git

Merged revisions 209516 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r209516 | mmichelson | 2009-07-30 09:38:21 -0500 (Thu, 30 Jul 2009) | 8 lines

  Fix a crash that can result if text codecs are allowed but textsupport is disabled.

  (closes issue #15596)
  Reported by: fabled
  Patches:
        sip-red.patch uploaded by fabled (license 448)
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2ac7045cfc..7db4bcf251 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7719,7 +7719,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
 	p->peercapability = newpeercapability;		        /* The other sides capability in latest offer */
 	p->jointnoncodeccapability = newnoncodeccapability;	/* DTMF capabilities */
 
-	if (p->jointcapability & AST_FORMAT_T140RED) {
+	if (p->trtp && (p->jointcapability & AST_FORMAT_T140RED)) {
 		p->red = 1; 
 		rtp_red_init(p->trtp, 300, red_data_pt, 2);
 	} else {