Merge remote-tracking branch 'public/bug11605_024'

This commit is contained in:
Nick Mathewson
2014-04-29 14:33:39 -04:00
2 changed files with 3 additions and 1 deletions
+2
View File
@@ -0,0 +1,2 @@
o Minor bugfixes (dmalloc):
- Fix compilation with dmalloc. Fixes bug 11605; bugfix on 0.2.4.10-alpha.
+1 -1
View File
@@ -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);