[asterisk-commits] mmichelson: trunk r350681 - in /trunk: ./ channels/sip/config_parser.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Jan 13 14:32:19 2012
New Revision: 350681

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=350681
Log:
Set port to a default sane value if a bogus one is provided when parsing hostnames.
........

Merged revisions 350679 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 350680 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/channels/sip/config_parser.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/sip/config_parser.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sip/config_parser.c?view=diff&rev=350681&r1=350680&r2=350681
==============================================================================
--- trunk/channels/sip/config_parser.c (original)
+++ trunk/channels/sip/config_parser.c Fri Jan 13 14:32:19 2012
@@ -672,7 +672,9 @@
 			ast_log(LOG_NOTICE, "'%s' is not a valid port number on line %d of sip.conf. using default.\n", port, lineno);
 			port = NULL;
 		}
-	} else {
+	}
+
+	if (!port) {
 		if (*transport & SIP_TRANSPORT_TLS) {
 			*portnum = STANDARD_TLS_PORT;
 		} else {