From: Paul Donald <newtwen+github@gmail.com>
Date: Fri, 20 Sep 2024 15:55:13 +0000 (+0200)
Subject: ubox validate: port range check fix
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=project%2Fubox.git

ubox validate: port range check fix

The luci GUI allows a single port in a port range field. This additional
check validates a single port if a range was not found.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
Link: https://github.com/openwrt/ubox/pull/7
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/validate/validate.c b/validate/validate.c
index e72b811..ffea1d5 100644
--- a/validate/validate.c
+++ b/validate/validate.c
@@ -597,8 +597,10 @@ dt_type_portrange(struct dt_state *s, int nargs)
 
 	n = strtoul(s->value, &e, 10);
 
-	if (e == s->value || *e != '-')
-		return false;
+	if (e == s->value || *e != '-') {
+		// If parsing as portrange fails, try parsing as a single port
+		return dt_type_port(s, nargs);
+	}
 
 	m = strtoul(e + 1, &e, 10);