[svn-commits] mmichelson: branch 1.6.1 r209517 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Jul 30 09:40:15 2009
New Revision: 209517

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209517
Log:
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)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=209517&r1=209516&r2=209517
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Thu Jul 30 09:40:15 2009
@@ -7719,7 +7719,7 @@
 	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 {