aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-30 14:40:15 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-30 14:40:15 +0000
commite4fd87cd06268caad4e3dd7cdf08b0875abf35b4 (patch)
tree4573008e2b7b3873585a04a14dde20dd29a8ed21 /channels
parent80dd526992fabf0dbce89f07f0b05d88d5ccf0fe (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@209517 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2ac7045cf..7db4bcf25 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 {