From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 25 Apr 2014 17:52:07 +0000 (-0400)
Subject: Make compilation of tor_memdup_nulterm() with dmalloc
X-Git-Tag: tor-0.2.5.5-alpha~120^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0a57bd363e822a5a216cf0857aaa272581113e2;p=thirdparty%2Ftor.git

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
index 0000000000..973ac6db18
--- /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 5eb0f9a69b..ca19bd2ba2 100644
--- 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);