From 6c426c59f9111565b5602249578e126ae6833845 Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Thu, 19 Sep 2024 21:15:17 +0300
Subject: [PATCH] nfqws,tpws: do not accept extra characters in port filters

---
 nfq/helpers.c  | 5 +++--
 tpws/helpers.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nfq/helpers.c b/nfq/helpers.c
index a1e3fa0..01d0558 100644
--- a/nfq/helpers.c
+++ b/nfq/helpers.c
@@ -319,6 +319,7 @@ bool pf_in_range(uint16_t port, const port_filter *pf)
 bool pf_parse(const char *s, port_filter *pf)
 {
 	unsigned int v1,v2;
+	char c;
 
 	if (!s) return false;
 	if (*s=='~')
@@ -328,13 +329,13 @@ bool pf_parse(const char *s, port_filter *pf)
 	}
 	else
 		pf->neg=false;
-	if (sscanf(s,"%u-%u",&v1,&v2)==2)
+	if (sscanf(s,"%u-%u%c",&v1,&v2,&c)==2)
 	{
 		if (v1>65535 || v2>65535 || v1>v2) return false;
 		pf->from=(uint16_t)v1;
 		pf->to=(uint16_t)v2;
 	}
-	else if (sscanf(s,"%u",&v1)==1)
+	else if (sscanf(s,"%u%c",&v1,&c)==1)
 	{
 		if (v1>65535) return false;
 		pf->to=pf->from=(uint16_t)v1;
diff --git a/tpws/helpers.c b/tpws/helpers.c
index 30c6f03..ce208f7 100644
--- a/tpws/helpers.c
+++ b/tpws/helpers.c
@@ -256,6 +256,7 @@ bool pf_in_range(uint16_t port, const port_filter *pf)
 bool pf_parse(const char *s, port_filter *pf)
 {
 	unsigned int v1,v2;
+	char c;
 
 	if (!s) return false;
 	if (*s=='~')
@@ -265,13 +266,13 @@ bool pf_parse(const char *s, port_filter *pf)
 	}
 	else
 		pf->neg=false;
-	if (sscanf(s,"%u-%u",&v1,&v2)==2)
+	if (sscanf(s,"%u-%u%c",&v1,&v2,&c)==2)
 	{
 		if (v1>65535 || v2>65535 || v1>v2) return false;
 		pf->from=(uint16_t)v1;
 		pf->to=(uint16_t)v2;
 	}
-	else if (sscanf(s,"%u",&v1)==1)
+	else if (sscanf(s,"%u%c",&v1,&c)==1)
 	{
 		if (v1>65535) return false;
 		pf->to=pf->from=(uint16_t)v1;