Opened 9 years ago

Closed 9 years ago

Last modified 6 years ago

#1832 closed defect (fixed)

Fix compiling Tor with --with-dmalloc

Reported by: karsten Owned by:
Priority: Medium Milestone: Tor: 0.2.2.x-final
Component: Core Tor/Tor Version:
Severity: Keywords:
Cc: nickm, Sebastian, ln5 Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

Tor doesn't compile with ./configure --with-dmalloc set. It does compile with the following patch, but I'm not sure if that's the fix we want:

diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index f56ccd9..e8f3e7c 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -53,7 +53,7 @@ HT_PROTOTYPE(microdesc_map, microdesc_t, node,
              _microdesc_hash, _microdesc_eq);
 HT_GENERATE(microdesc_map, microdesc_t, node,
              _microdesc_hash, _microdesc_eq, 0.6,
-             _tor_malloc, _tor_realloc, _tor_free);
+             malloc, realloc, free);
 
 /** Write the body of <b>md</b> into <b>f</b>, with appropriate annotations.
  * On success, return the total number of bytes written, and set
diff --git a/src/test/test.c b/src/test/test.c
index ff166ce..0cad8fc 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -61,6 +61,7 @@ double fabs(double x);
 #ifdef USE_DMALLOC
 #include <dmalloc.h>
 #include <openssl/crypto.h>
+#include "main.h"
 #endif
 
 /** Set to true if any unit test has failed.  Mostly, this is set by the macros

Child Tickets

Change History (3)

comment:1 Changed 9 years ago by nickm

Milestone: Tor: 0.2.2.x-final
Status: newneeds_review

comment:2 Changed 9 years ago by nickm

Resolution: fixed
Status: needs_reviewclosed

Looks okay to me. Applied as 15379a7254a5d.

comment:3 Changed 6 years ago by nickm

Component: Tor ClientTor
Note: See TracTickets for help on using tickets.