diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-25 13:52:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-25 13:52:07 -0400 |
| commit | f0a57bd363e822a5a216cf0857aaa272581113e2 (patch) | |
| tree | 12fcb3fbd0ea44d978ed495bb402e12662a7313a | |
| parent | 9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8 (diff) | |
| download | tor-f0a57bd363e822a5a216cf0857aaa272581113e2.tar tor-f0a57bd363e822a5a216cf0857aaa272581113e2.tar.gz | |
Make compilation of tor_memdup_nulterm() with dmalloc
Fixes bug 11605; bugfix on 0.2.4.10-alpha.
| -rw-r--r-- | changes/bug11605 | 2 | ||||
| -rw-r--r-- | src/common/util.c | 2 |
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 5eb0f9a69..ca19bd2ba 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); |