[asterisk-commits] markm: branch 1.8 r321100 - in /branches/1.8: channels/ main/

[SVN commits to the Asterisk project]

Author: markm
Date: Thu May 26 15:09:35 2011
New Revision: 321100

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321100
Log:
ast_sockaddr_resolve() in netsock2.c may deref a null pointer

Added a null check in netsock2 ast_sockaddr_resolve() as well as added default initalizers in chan_sip parse_uri_legacy_check() to make sure that invalid uris will make null (and not undefined) user,pass,domain,transport variables

(closes issue #19346)
Reported by: kobaz
Patches: 
      netsock2.patch uploaded by kobaz (license 834)
Tested by: kobaz, Marquis


Modified:
    branches/1.8/channels/chan_sip.c
    branches/1.8/main/netsock2.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=321100&r1=321099&r2=321100
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Thu May 26 15:09:35 2011
@@ -13288,6 +13288,20 @@
 
 /*! \brief parse uri in a way that allows semicolon stripping if legacy mode is enabled */
 static int parse_uri_legacy_check(char *uri, const char *scheme, char **user, char **pass, char **domain, char **transport) {
+	/* Assume invalid to start */
+	if (user) {
+		*user = 0;
+	}
+	if (pass) {
+		*pass = 0;
+	}
+	if (domain) {
+		*domain = 0;
+	}
+	if (transport) {
+		*transport = 0;
+	}
+
 	int ret = parse_uri(uri, scheme, user, pass, domain, transport);
 	if (sip_cfg.legacy_useroption_parsing) { /* if legacy mode is active, strip semis from the user field */
 		char *p;

Modified: branches/1.8/main/netsock2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/netsock2.c?view=diff&rev=321100&r1=321099&r2=321100
==============================================================================
--- branches/1.8/main/netsock2.c (original)
+++ branches/1.8/main/netsock2.c Thu May 26 15:09:35 2011
@@ -232,6 +232,10 @@
 	char *s, *host, *port;
 	int	e, i, res_cnt;
 
+	if (!str) {
+		return 0;
+	}
+
 	s = ast_strdupa(str);
 	if (!ast_sockaddr_split_hostport(s, &host, &port, flags)) {
 		return 0;