From 58a64924ddff9e6e1c9d8d0faa876af0449695d4 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Wed, 2 Mar 2016 19:00:28 +0300 Subject: [PATCH] log_mutex used prior to initialization --- src/3proxy.c | 1 + src/proxy.h | 1 - src/proxymain.c | 7 +------ 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/3proxy.c b/src/3proxy.c index 5e5f66c..8675503 100644 --- a/src/3proxy.c +++ b/src/3proxy.c @@ -515,6 +515,7 @@ int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int pthread_mutex_init(&hash_mutex, NULL); pthread_mutex_init(&tc_mutex, NULL); pthread_mutex_init(&pwl_mutex, NULL); + pthread_mutex_init(&log_mutex, NULL); freeconf(&conf); res = readconfig(fp); diff --git a/src/proxy.h b/src/proxy.h index fa0a25c..3c93658 100644 --- a/src/proxy.h +++ b/src/proxy.h @@ -314,7 +314,6 @@ extern pthread_mutex_t hash_mutex; extern pthread_mutex_t tc_mutex; extern pthread_mutex_t pwl_mutex; extern pthread_mutex_t log_mutex; - extern struct datatype datatypes[64]; extern struct commands commandhandlers[]; diff --git a/src/proxymain.c b/src/proxymain.c index d409d9b..d809b81 100644 --- a/src/proxymain.c +++ b/src/proxymain.c @@ -9,7 +9,6 @@ #include "proxy.h" pthread_mutex_t log_mutex; -int logmutexinit = 0; #define param ((struct clientparam *) p) #ifdef _WIN32 @@ -180,11 +179,6 @@ int MODULEMAINFUNC (int argc, char** argv){ #endif #endif - if(!logmutexinit){ - pthread_mutex_init(&log_mutex, NULL); - logmutexinit = 1; - } - srvinit(&srv, &defparam); srv.pf = childdef.pf; isudp = childdef.isudp; @@ -202,6 +196,7 @@ int MODULEMAINFUNC (int argc, char** argv){ } #else srv.needuser = 0; + pthread_mutex_init(&log_mutex, NULL); #endif for (i=1; i