[svn-commits] kmoore: branch 13 r420950 - in /branches/13: ./ res/res_pjsip.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Wed Aug 13 11:53:09 2014
New Revision: 420950

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420950
Log:
PJSIP: Prevent crash no-URI contacts

This prevents a crash from occurring when a contact with no URI is used
for the creation of an outbound out-of-dialog request with no
associated endpoint.
........

Merged revisions 420949 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    branches/13/   (props changed)
    branches/13/res/res_pjsip.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_pjsip.c?view=diff&rev=420950&r1=420949&r2=420950
==============================================================================
--- branches/13/res/res_pjsip.c (original)
+++ branches/13/res/res_pjsip.c Wed Aug 13 11:53:09 2014
@@ -2285,7 +2285,7 @@
 	pjsip_tpselector selector = { .type = PJSIP_TPSELECTOR_NONE, };
 
 	if (ast_strlen_zero(uri)) {
-		if (!endpoint && !contact) {
+		if (!endpoint && (!contact || ast_strlen_zero(contact->uri))) {
 			ast_log(LOG_ERROR, "An endpoint and/or uri must be specified\n");
 			return -1;
 		}