Make compilation of tor_memdup_nulterm() with dmalloc

Fixes bug 11605; bugfix on 0.2.4.10-alpha.

diff --git a/changes/bug11605 b/changes/bug11605
new file mode 100644 (file)
index 0000000..973ac6d
--- /dev/null
+++ b/changes/bug11605
@@ -0,0 +1,2 @@
+  o Minor bugfixes (dmalloc):
+    - Fix compilation with dmalloc. Fixes bug 11605; bugfix on 0.2.4.10-alpha.

diff --git a/src/common/util.c b/src/common/util.c
index 5eb0f9a69bc8756a04a0bde631942f3dfd55b6d9..ca19bd2ba201072c615ee6df1faf743a8465521b 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -284,7 +284,7 @@ tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS)
 /** As tor_memdup(), but add an extra 0 byte at the end of the resulting
  * memory. */
 void *
-tor_memdup_nulterm(const void *mem, size_t len DMALLOC_PARAMS)
+tor_memdup_nulterm_(const void *mem, size_t len DMALLOC_PARAMS)
 {
   char *dup;
   tor_assert(len < SIZE_T_CEILING+1);