diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-11 21:18:03 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-11 21:18:03 +0000 |
| commit | d40186daa130f32883346437fe678fb06a6ae7ae (patch) | |
| tree | fe4a070661ce74f1c165f12f0c9b71d7bf5c07b9 | |
| parent | 2f689611193240515adf31c296d5dbaba07e7a43 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@200149 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ea333ed15..6599eb735 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) { |