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.1@200152 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0d6a1a511555596af5da8db4064d24cfbcf1cc44..ab62db4a07d6caa6ca5a71a163c03d0933189173 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8171,7 +8171,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) {