[asterisk-commits] qwell: tag 1.8.7.1 r341194 - in /tags/1.8.7.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Oct 17 12:46:26 2011
New Revision: 341194

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341194
Log:
Changes for AST-2011-012.

Modified:
    tags/1.8.7.1/   (props changed)
    tags/1.8.7.1/channels/chan_sip.c

Propchange: tags/1.8.7.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 12:46:26 2011
@@ -1,2 +1,2 @@
 /be/branches/C.3:256426
-/branches/1.8:335714,335851,335911
+/branches/1.8:335714,335851,335911,341189

Modified: tags/1.8.7.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.7.1/channels/chan_sip.c?view=diff&rev=341194&r1=341193&r2=341194
==============================================================================
--- tags/1.8.7.1/channels/chan_sip.c (original)
+++ tags/1.8.7.1/channels/chan_sip.c Mon Oct 17 12:46:26 2011
@@ -13460,7 +13460,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;
@@ -13538,7 +13538,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");
 	}