[asterisk-commits] qwell: tag 1.8.8.0-rc2 r341309 - /tags/1.8.8.0-rc2/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Oct 18 16:44:37 2011
New Revision: 341309

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341309
Log:
Merge r341189 from branches/1.8/ for AST-2011-012

Modified:
    tags/1.8.8.0-rc2/channels/chan_sip.c

Modified: tags/1.8.8.0-rc2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.0-rc2/channels/chan_sip.c?view=diff&rev=341309&r1=341308&r2=341309
==============================================================================
--- tags/1.8.8.0-rc2/channels/chan_sip.c (original)
+++ tags/1.8.8.0-rc2/channels/chan_sip.c Tue Oct 18 16:44:37 2011
@@ -13473,7 +13473,7 @@
 	char data[SIPBUFSIZE];
 	const char *expires = get_header(req, "Expires");
 	int expire = atoi(expires);
-	char *curi, *domain, *transport;
+	char *curi = NULL, *domain = NULL, *transport = NULL;
 	int transport_type;
 	const char *useragent;
 	struct ast_sockaddr oldsin, testsa;
@@ -13551,7 +13551,7 @@
 	ast_string_field_build(pvt, our_contact, "<%s>", curi);
 
 	/* Make sure it's a SIP URL */
-	if (parse_uri_legacy_check(curi, "sip:,sips:", &curi, NULL, &domain, &transport)) {
+	if (ast_strlen_zero(curi) || parse_uri_legacy_check(curi, "sip:,sips:", &curi, NULL, &domain, &transport)) {
 		ast_log(LOG_NOTICE, "Not a valid SIP contact (missing sip:/sips:) trying to use anyway\n");
 	}