aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug116052
-rw-r--r--src/common/util.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/bug11605 b/changes/bug11605
new file mode 100644
index 000000000..973ac6db1
--- /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 86bb8baae..56235aa66 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -303,7 +303,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);