diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-29 14:33:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-29 14:33:39 -0400 |
| commit | 545e2119f2e96dedef2efd254632f0204f70ab76 (patch) | |
| tree | 904107f344c26bc2e7f761157a53ff2742f724ce /src | |
| parent | acc7623420139d13377ac441e8d5c5f468cf95c5 (diff) | |
| parent | f0a57bd363e822a5a216cf0857aaa272581113e2 (diff) | |
| download | tor-545e2119f2e96dedef2efd254632f0204f70ab76.tar.gz tor-545e2119f2e96dedef2efd254632f0204f70ab76.zip | |
Merge remote-tracking branch 'public/bug11605_024'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c index 86bb8baaef..56235aa662 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); |