atmos
/
ban2fail
mirror of https://github.com/jrbrtsn/ban2fail
1
1
Fork 0
Code Issues Releases Wiki Activity

Another loop break condition bug

This commit is contained in:
john 2021-02-26 13:16:14 -05:00
parent 757fef9c9e
commit 3aa81aac46
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ban2fail.c
View File

@ -92,7 +92,7 @@ struct Global G= {
.version= {
.major= 0,
.minor= 14,
.patch= 6
.patch= 7
},
.bitTuples.flags= GlobalFlagBitTuples

13
iptables.c
View File

@ -270,6 +270,15 @@ _control_addresses(const char *cmdFlag, PTRVEC *h_vec)
/* Move any ipv6 addresses to the end */
PTRVEC_sort(h_vec, addrCmp_pvsort);
#ifdef DEBUG
{
const char *addr;
unsigned i;
PTRVEC_loopFwd(h_vec, i, addr) {
eprintf("%s", addr);
}
}
#endif
{ /* Place comma separated address list into single string buffer */
const char *colon=NULL;
@ -298,7 +307,7 @@ _control_addresses(const char *cmdFlag, PTRVEC *h_vec)
/* Keep adding addresses until we bump up against iptables maximum,
* or run out of ipv4 addresses
*/
if(!naddr || (naddr < IPTABLES_MAX_ADDR && !colon))
if(!naddr || (naddr < IPTABLES_MAX_ADDR && (addr && !colon)))
continue;
// Place string buffer in argv
@ -342,7 +351,7 @@ _control_addresses(const char *cmdFlag, PTRVEC *h_vec)
/* See if there is another address */
addr= PTRVEC_remHead(h_vec);
/* Break out if nthing remains */
/* Break out if nothing remains */
if(!addr && !naddr)
break;