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

log_mutex used prior to initialization

Browse Source
This commit is contained in:
z3APA3A 2016-03-02 19:00:28 +03:00
parent 75a7d5bb9e
commit 58a64924dd
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/3proxy.c
View File

@ -515,6 +515,7 @@ int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int
pthread_mutex_init(&hash_mutex, NULL); pthread_mutex_init(&hash_mutex, NULL);
pthread_mutex_init(&tc_mutex, NULL); pthread_mutex_init(&tc_mutex, NULL);
pthread_mutex_init(&pwl_mutex, NULL); pthread_mutex_init(&pwl_mutex, NULL);
pthread_mutex_init(&log_mutex, NULL);
freeconf(&conf); freeconf(&conf);
res = readconfig(fp); res = readconfig(fp);

1
src/proxy.h
View File

@ -314,7 +314,6 @@ extern pthread_mutex_t hash_mutex;
extern pthread_mutex_t tc_mutex; extern pthread_mutex_t tc_mutex;
extern pthread_mutex_t pwl_mutex; extern pthread_mutex_t pwl_mutex;
extern pthread_mutex_t log_mutex; extern pthread_mutex_t log_mutex;
extern struct datatype datatypes[64]; extern struct datatype datatypes[64];
extern struct commands commandhandlers[]; extern struct commands commandhandlers[];

7
src/proxymain.c
View File

@ -9,7 +9,6 @@
#include "proxy.h" #include "proxy.h"
pthread_mutex_t log_mutex; pthread_mutex_t log_mutex;
int logmutexinit = 0;
#define param ((struct clientparam *) p) #define param ((struct clientparam *) p)
#ifdef _WIN32 #ifdef _WIN32
@ -180,11 +179,6 @@ int MODULEMAINFUNC (int argc, char** argv){
#endif #endif
#endif #endif
if(!logmutexinit){
pthread_mutex_init(&log_mutex, NULL);
logmutexinit = 1;
}
srvinit(&srv, &defparam); srvinit(&srv, &defparam);
srv.pf = childdef.pf; srv.pf = childdef.pf;
isudp = childdef.isudp; isudp = childdef.isudp;
@ -202,6 +196,7 @@ int MODULEMAINFUNC (int argc, char** argv){
} }
#else #else
srv.needuser = 0; srv.needuser = 0;
pthread_mutex_init(&log_mutex, NULL);
#endif #endif
for (i=1; i<argc; i++) { for (i=1; i<argc; i++) {