From bd9f6cf82df663ba5155f6489e18d50b5a5a7756 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Thu, 11 Jun 2009 21:18:03 +0000 Subject: [PATCH] Merged revisions 200146 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r200146 | mmichelson | 2009-06-11 16:17:14 -0500 (Thu, 11 Jun 2009) | 5 lines Fix a crash due to a potentially NULL p->options. Thanks to mnicholson for pointing it out. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200149 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ea333ed153..6599eb7355 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7811,7 +7811,7 @@ static int reqprep(struct sip_request *req, struct sip_pvt *p, int sipmethod, in * Similarly, if we need to re-send an INVITE with auth credentials, then we * need to use the same branch as we did the first time we sent the INVITE. */ - if (sipmethod == SIP_CANCEL || (sipmethod == SIP_INVITE && !ast_strlen_zero(p->options->auth))) { + if (sipmethod == SIP_CANCEL || (sipmethod == SIP_INVITE && p->options && !ast_strlen_zero(p->options->auth))) { p->branch = p->invite_branch; build_via(p); } else if (newbranch) {