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

Fix potential inithashtable() race condition

Browse Source 
potential race condition on configuration reload.
This commit is contained in:
z3APA3A 2015-09-11 22:59:40 +03:00
parent 5ef18c48f1
commit 1be182c65f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/auth.c
View File

@ -922,6 +922,7 @@ int inithashtable(struct hashtable *ht, unsigned nhashsize){
unsigned i; unsigned i;
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;
@ -932,11 +933,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)))){ if(!(ht->hashvalues = myalloc(nhashsize * sizeof(struct hashentry)))){
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;
@ -946,6 +949,7 @@ int inithashtable(struct hashtable *ht, unsigned nhashsize){
(ht->hashvalues + i)->next = ht->hashvalues + i + 1; (ht->hashvalues + i)->next = ht->hashvalues + i + 1;
} }
ht->hashempty = ht->hashvalues; ht->hashempty = ht->hashvalues;
pthread_mutex_unlock(&hash_mutex);
return 0; return 0;
} }