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 2ac7045cfc6f7b6d86ecfacab89bcf2bcc65024f..7db4bcf25154cbe816e97953a4e9d1775fd418b4 100644 (file)
--- 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 {