From: Jonathan Rose <jrose@digium.com>
Date: Mon, 23 May 2011 14:33:20 +0000 (+0000)
Subject: Fixes segfault occuring in chan_sip.c at __set_address_from_contact
X-Git-Tag: 1.8.5-rc1~11^2~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2d4426842d2be1ecb212f00429c719ba9c8b7d0;p=thirdparty%2Fasterisk.git

Fixes segfault occuring in chan_sip.c at __set_address_from_contact

Checks to see if domain contains anything before sending it off to ast_sockaddr_resolve
which is where the segfault was occuring due to null str.

(closes issue #18857)
Reported by: sybasesql

Review: https://reviewboard.asterisk.org/r/1225/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@320504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 331427f5c9..c25b374254 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13326,6 +13326,13 @@ static int __set_address_from_contact(const char *fullcontact, struct ast_sockad
 		assume that the domain part is a host name and only look for an A/AAAA record in DNS.
 	*/
 
+	/* If we took in an invalid URI, domain may not have been initialized */
+	/* ast_sockaddr_resolve requires an initialized domain string. */
+	if (ast_strlen_zero(domain)) {
+		ast_log(LOG_WARNING, "Invalid URI: parse_uri failed to acquire domain\n");
+		return -1;
+	}
+
 	if (ast_sockaddr_resolve_first(addr, domain, 0)) {
 		ast_log(LOG_WARNING, "Invalid host name in Contact: (can't "
 			"resolve in DNS) : '%s'\n", domain);