From 12d7d81e6c1c9f7d4f70b29de293deb519883f3b Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Mon, 23 May 2011 14:40:59 +0000 Subject: [PATCH] Merged revisions 320504 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r320504 | jrose | 2011-05-23 09:33:20 -0500 (Mon, 23 May 2011) | 10 lines 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/trunk@320505 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 82b27acfac..0c515a954b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13589,6 +13589,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);