[or-cvs] r14200: Backport fix so dmalloc can work again. (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-03-26 13:25:28 -0400 (Wed, 26 Mar 2008)
New Revision: 14200

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/main.c
Log:
 r19069 at catbus:  nickm | 2008-03-26 13:25:11 -0400
 Backport fix so dmalloc can work again.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r19069] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-26 17:25:16 UTC (rev 14199)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-26 17:25:28 UTC (rev 14200)
@@ -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

Modified: tor/branches/tor-0_2_0-patches/src/or/main.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/main.c	2008-03-26 17:25:16 UTC (rev 14199)
+++ tor/branches/tor-0_2_0-patches/src/or/main.c	2008-03-26 17:25:28 UTC (rev 14200)
@@ -1963,12 +1963,12 @@
 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;