r19069@catbus: nickm | 2008-03-26 13:25:11 -0400

Backport fix so dmalloc can work again.


svn:r14200

ChangeLog

@@ -1,3 +1,9 @@
+Changes in version 0.2.0.24-?? - 2008-??-??
+  o Minor bugfixes:
+    - Initialize log mutex before initializing dmalloc.  Otherwise,
+      running with dmalloc would crash. Bugfix on 0.2.0.x-alpha.
+
+
 Changes in version 0.2.0.23-rc - 2008-03-24
   o Major bugfixes:
     - When a tunneled directory request is made to a directory server

src/or/main.c

@@ -1963,12 +1963,12 @@ int
 tor_main(int argc, char *argv[])
 {
   int result = 0;
+  init_logging();
 #ifdef USE_DMALLOC
   int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc,
                                       _tor_dmalloc_free);
   log_notice(LD_CONFIG, "Set up dmalloc; returned %d", r);
 #endif
-  init_logging();
 #ifdef NT_SERVICE
   {
      int done = 0;