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

Avoid some potential hashtables race conditions

Browse Source
This commit is contained in:
z3APA3A 2015-05-04 17:39:24 +03:00
parent 8e6d8b3314
commit aa4125a6f0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/auth.c
View File

@ -901,6 +901,7 @@ int inithashtable(struct hashtable *ht, unsigned nhashsize){
c = clock(); c = clock();
if(nhashsize<4) return 1; if(nhashsize<4) return 1;
pthread_mutex_lock(&hash_mutex);
if(ht->hashtable){ if(ht->hashtable){
myfree(ht->hashtable); myfree(ht->hashtable);
ht->hashtable = NULL; ht->hashtable = NULL;
@ -911,11 +912,13 @@ int inithashtable(struct hashtable *ht, unsigned nhashsize){
} }
ht->hashsize = 0; ht->hashsize = 0;
if(!(ht->hashtable = myalloc((nhashsize>>2) * sizeof(struct hashentry *)))){ if(!(ht->hashtable = myalloc((nhashsize>>2) * sizeof(struct hashentry *)))){
pthread_mutex_unlock(&hash_mutex);
return 2; return 2;
} }
if(!(ht->hashvalues = myalloc(nhashsize * (sizeof(struct hashentry) + (ht->recsize-4))))){ if(!(ht->hashvalues = myalloc(nhashsize * (sizeof(struct hashentry) + (ht->recsize-4))))){
myfree(ht->hashtable); myfree(ht->hashtable);
ht->hashtable = NULL; ht->hashtable = NULL;
pthread_mutex_unlock(&hash_mutex);
return 3; return 3;
} }
ht->hashsize = nhashsize; ht->hashsize = nhashsize;
@ -930,6 +933,7 @@ int inithashtable(struct hashtable *ht, unsigned nhashsize){
hvalue(i)->next = hvalue(i+1); hvalue(i)->next = hvalue(i+1);
} }
ht->hashempty = ht->hashvalues; ht->hashempty = ht->hashvalues;
pthread_mutex_unlock(&hash_mutex);
return 0; return 0;
} }
@ -969,10 +973,13 @@ unsigned long hashresolv(struct hashtable *ht, const unsigned char* name, unsign
struct hashentry *he; struct hashentry *he;
unsigned index; unsigned index;
if(!ht->hashtable || !name) return 0; pthread_mutex_lock(&hash_mutex);
if(!ht || !ht->hashtable || !name) {
pthread_mutex_unlock(&hash_mutex);
return 0;
}
nametohash(name, hash, (unsigned char *)ht->rnd); nametohash(name, hash, (unsigned char *)ht->rnd);
index = hashindex(ht, hash); index = hashindex(ht, hash);
pthread_mutex_lock(&hash_mutex);
for(hep = ht->hashtable + index; (he = *hep)!=NULL; ){ for(hep = ht->hashtable + index; (he = *hep)!=NULL; ){
if(he->expires < conf.time) { if(he->expires < conf.time) {
(*hep) = he->next; (*hep) = he->next;