mirror of
https://github.com/jrbrtsn/ban2fail
synced 2024-06-16 11:58:01 +00:00
Another loop break condition bug
This commit is contained in:
parent
757fef9c9e
commit
3aa81aac46
@ -92,7 +92,7 @@ struct Global G= {
|
|||||||
.version= {
|
.version= {
|
||||||
.major= 0,
|
.major= 0,
|
||||||
.minor= 14,
|
.minor= 14,
|
||||||
.patch= 6
|
.patch= 7
|
||||||
},
|
},
|
||||||
|
|
||||||
.bitTuples.flags= GlobalFlagBitTuples
|
.bitTuples.flags= GlobalFlagBitTuples
|
||||||
|
13
iptables.c
13
iptables.c
@ -270,6 +270,15 @@ _control_addresses(const char *cmdFlag, PTRVEC *h_vec)
|
|||||||
|
|
||||||
/* Move any ipv6 addresses to the end */
|
/* Move any ipv6 addresses to the end */
|
||||||
PTRVEC_sort(h_vec, addrCmp_pvsort);
|
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 */
|
{ /* Place comma separated address list into single string buffer */
|
||||||
const char *colon=NULL;
|
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,
|
/* Keep adding addresses until we bump up against iptables maximum,
|
||||||
* or run out of ipv4 addresses
|
* or run out of ipv4 addresses
|
||||||
*/
|
*/
|
||||||
if(!naddr || (naddr < IPTABLES_MAX_ADDR && !colon))
|
if(!naddr || (naddr < IPTABLES_MAX_ADDR && (addr && !colon)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Place string buffer in argv
|
// Place string buffer in argv
|
||||||
@ -342,7 +351,7 @@ _control_addresses(const char *cmdFlag, PTRVEC *h_vec)
|
|||||||
/* See if there is another address */
|
/* See if there is another address */
|
||||||
addr= PTRVEC_remHead(h_vec);
|
addr= PTRVEC_remHead(h_vec);
|
||||||
|
|
||||||
/* Break out if nthing remains */
|
/* Break out if nothing remains */
|
||||||
if(!addr && !naddr)
|
if(!addr && !naddr)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user