Change is_port() to only validate a single port, we have is_portrange() for specific cases. Make necessary adjustments after check all is_port() calls. It fixes #3857

1 files changed, 7 insertions, 10 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 402ef3e..e672970 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -677,15 +677,12 @@ function is_validaliasname($name) {
 
 /* returns true if $port is a valid TCP/UDP port */
 function is_port($port) {
-	$tmpports = explode(":", $port);
-	foreach($tmpports as $tmpport) {
-		if (getservbyname($tmpport, "tcp") || getservbyname($tmpport, "udp"))
-			continue;
-		if (!ctype_digit($tmpport))
-			return false;
-		else if ((intval($tmpport) < 1) || (intval($tmpport) > 65535))
-			return false;
-	}
+	if (getservbyname($port, "tcp") || getservbyname($port, "udp"))
+		return true;
+	if (!ctype_digit($port))
+		return false;
+	else if ((intval($port) < 1) || (intval($port) > 65535))
+		return false;
 	return true;
 }
 
@@ -1255,7 +1252,7 @@ function alias_expand($name) {
 
 	if (isset($aliastable[$name]))
 		return "\${$name}";
-	else if (is_ipaddr($name) || is_subnet($name) || is_port($name))
+	else if (is_ipaddr($name) || is_subnet($name) || is_port($name) || is_portrange($name))
 		return "{$name}";
 	else
 		return null;