bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 18:45:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct ip/network/hostname parsing in ACLs

Browse Source
This commit is contained in:
z3APA3A 2020-04-11 09:58:47 +03:00
parent 37c380f4f7
commit 041134007d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf.c
View File

@ -868,9 +868,11 @@ struct ace * make_ace (int argc, unsigned char ** argv){
do { do {
int arglen; int arglen;
unsigned char *pattern; unsigned char *pattern;
struct iplist tmpip={NULL};
arglen = (int)strlen((char *)arg); arglen = (int)strlen((char *)arg);
if(arglen > 0 && (arg[arglen-1] < '0' || arg[arglen-1] > '9')){ if(scanipl(arg, &tmpip)){
if(!arglen) continue;
if(!acl->dstnames) { if(!acl->dstnames) {
acl->dstnames = hostnamel = myalloc(sizeof(struct hostname)); acl->dstnames = hostnamel = myalloc(sizeof(struct hostname));
} }
@ -914,11 +916,7 @@ struct ace * make_ace (int argc, unsigned char ** argv){
fprintf(stderr, "No memory for ACL entry, line %d\n", linenum); fprintf(stderr, "No memory for ACL entry, line %d\n", linenum);
return(NULL); return(NULL);
} }
memset(ipl, 0, sizeof(struct iplist)); *ipl = tmpip;
if (scanipl(arg, ipl)) {
fprintf(stderr, "Invalid IP, IP range or CIDR, line %d\n", linenum);
return(NULL);
}
} }
}while((arg = (unsigned char *)strtok((char *)NULL, ","))); }while((arg = (unsigned char *)strtok((char *)NULL, ",")));
} }