[asterisk-commits] jrose: branch 1.8 r320504 - /branches/1.8/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon May 23 09:33:20 2011
New Revision: 320504

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320504
Log:
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/

Modified:
    branches/1.8/channels/chan_sip.c

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=320504&r1=320503&r2=320504
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Mon May 23 09:33:20 2011
@@ -13326,6 +13326,13 @@
 		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);