Przeglądaj źródła

log_mutex used prior to initialization

z3APA3A 10 lat temu
rodzic
commit
58a64924dd
3 zmienionych plików z 2 dodań i 7 usunięć
  1. 1 0
      src/3proxy.c
  2. 0 1
      src/proxy.h
  3. 1 6
      src/proxymain.c

+ 1 - 0
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);

+ 0 - 1
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[];

+ 1 - 6
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<argc; i++) {