9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reject: reorder to avoid leaks

Browse source
This commit is contained in:
Ed Kellett 2020-01-03 17:07:25 +00:00
parent b9c43bc08a
commit 6cd12661af
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
1 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ircd/reject.c
View file

@ -233,35 +233,39 @@ check_reject(rb_fde_t *F, struct sockaddr *addr)
rb_patricia_node_t *pnode; rb_patricia_node_t *pnode;
reject_t *rdata; reject_t *rdata;
delay_t *ddata; delay_t *ddata;
/* Reject is disabled */ /* Reject is disabled */
if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0) if (ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_duration == 0)
return 0; return 0;
pnode = rb_match_ip(reject_tree, addr); pnode = rb_match_ip(reject_tree, addr);
if(pnode != NULL) if (pnode == NULL)
{ return 0;
rdata = pnode->data;
rdata = pnode->data;
rdata->time = rb_current_time(); rdata->time = rb_current_time();
if(rdata->count > (unsigned long)ConfigFileEntry.reject_after_count)
{ if (rdata->count <= (unsigned long)ConfigFileEntry.reject_after_count)
ddata = rb_malloc(sizeof(delay_t)); return 0;
ServerStats.is_rej++;
rb_setselect(F, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL); if (rdata->aconf != NULL && rdata->aconf->status & CONF_ILLEGAL)
if(rdata->aconf)
{
if(rdata->aconf->status & CONF_ILLEGAL)
{ {
rb_dlinkDelete(&rdata->rnode, &reject_list); rb_dlinkDelete(&rdata->rnode, &reject_list);
reject_free(rdata); reject_free(rdata);
rb_patricia_remove(reject_tree, pnode); rb_patricia_remove(reject_tree, pnode);
return 0; return 0;
} }
ddata = rb_malloc(sizeof(delay_t));
ServerStats.is_rej++;
rb_setselect(F, RB_SELECT_WRITE | RB_SELECT_READ, NULL, NULL);
if (rdata->aconf)
{
ddata->aconf = rdata->aconf; ddata->aconf = rdata->aconf;
ddata->aconf->clients++; ddata->aconf->clients++;
ddata->reason = NULL; ddata->reason = NULL;
} }
else if(rdata->reason) else if (rdata->reason)
{ {
ddata->reason = rdata->reason; ddata->reason = rdata->reason;
ddata->aconf = NULL; ddata->aconf = NULL;
@ -274,10 +278,6 @@ check_reject(rb_fde_t *F, struct sockaddr *addr)
ddata->F = F; ddata->F = F;
rb_dlinkAdd(ddata, &ddata->node, &delay_exit); rb_dlinkAdd(ddata, &ddata->node, &delay_exit);
return 1; return 1;
}
}
/* Caller does what it wants */
return 0;
} }
int int