ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-11 17:29:16 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfqws,tpws: do not accept extra characters in port filters

Browse Source
This commit is contained in:
bol-van 2024-09-19 21:15:17 +03:00
parent d4a7eef17e
commit 6c426c59f9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nfq/helpers.c
View File

@ -319,6 +319,7 @@ bool pf_in_range(uint16_t port, const port_filter *pf)
bool pf_parse(const char *s, port_filter *pf) bool pf_parse(const char *s, port_filter *pf)
{ {
unsigned int v1,v2; unsigned int v1,v2;
char c;
if (!s) return false; if (!s) return false;
if (*s=='~') if (*s=='~')
@ -328,13 +329,13 @@ bool pf_parse(const char *s, port_filter *pf)
} }
else else
pf->neg=false; 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; if (v1>65535 || v2>65535 || v1>v2) return false;
pf->from=(uint16_t)v1; pf->from=(uint16_t)v1;
pf->to=(uint16_t)v2; 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; if (v1>65535) return false;
pf->to=pf->from=(uint16_t)v1; pf->to=pf->from=(uint16_t)v1;

5
tpws/helpers.c
View File

@ -256,6 +256,7 @@ bool pf_in_range(uint16_t port, const port_filter *pf)
bool pf_parse(const char *s, port_filter *pf) bool pf_parse(const char *s, port_filter *pf)
{ {
unsigned int v1,v2; unsigned int v1,v2;
char c;
if (!s) return false; if (!s) return false;
if (*s=='~') if (*s=='~')
@ -265,13 +266,13 @@ bool pf_parse(const char *s, port_filter *pf)
} }
else else
pf->neg=false; 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; if (v1>65535 || v2>65535 || v1>v2) return false;
pf->from=(uint16_t)v1; pf->from=(uint16_t)v1;
pf->to=(uint16_t)v2; 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; if (v1>65535) return false;
pf->to=pf->from=(uint16_t)v1; pf->to=pf->from=(uint16_t)v1;