[asterisk-commits] mmichelson: branch 1.6.1 r200152 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jun 11 16:18:37 2009
New Revision: 200152

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

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=200152&r1=200151&r2=200152
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Thu Jun 11 16:18:37 2009
@@ -8171,7 +8171,7 @@
 	 * 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) {