Make compilation of tor_memdup_nulterm() with dmalloc

Fixes bug 11605; bugfix on 0.2.4.10-alpha.
This commit is contained in:
Nick Mathewson 2014-04-25 13:52:07 -04:00
parent 9e44df2c98
commit f0a57bd363
2 changed files with 3 additions and 1 deletions

2
changes/bug11605 Normal file
View File

@ -0,0 +1,2 @@
o Minor bugfixes (dmalloc):
- Fix compilation with dmalloc. Fixes bug 11605; bugfix on 0.2.4.10-alpha.

View File

@ -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 /** As tor_memdup(), but add an extra 0 byte at the end of the resulting
* memory. */ * memory. */
void * 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; char *dup;
tor_assert(len < SIZE_T_CEILING+1); tor_assert(len < SIZE_T_CEILING+1);