diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-17 10:48:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-17 10:48:39 -0400 |
| commit | bbc049a7561f8247db130a7b9115ce4ff392cf99 (patch) | |
| tree | f49a68c963bd163f8e49728691f3244cad127850 /src/common/util.h | |
| parent | d34d0b4dc523ae35ab9f9fdc79a54c2601161996 (diff) | |
| parent | 42731f69efc1f7b0614a33cd6ea7a70903bfc98b (diff) | |
| download | tor-bbc049a7561f8247db130a7b9115ce4ff392cf99.tar.gz tor-bbc049a7561f8247db130a7b9115ce4ff392cf99.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/util.h b/src/common/util.h index 0dd6da3a57..018316e1b5 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -83,6 +83,8 @@ char *tor_strndup_(const char *s, size_t n DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); void *tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); +void *tor_memdup_nulterm_(const void *mem, size_t len DMALLOC_PARAMS) + ATTR_MALLOC ATTR_NONNULL((1)); void tor_free_(void *mem); #ifdef USE_DMALLOC extern int dmalloc_free(const char *file, const int line, void *pnt, @@ -116,6 +118,7 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, #define tor_strdup(s) tor_strdup_(s DMALLOC_ARGS) #define tor_strndup(s, n) tor_strndup_(s, n DMALLOC_ARGS) #define tor_memdup(s, n) tor_memdup_(s, n DMALLOC_ARGS) +#define tor_memdup_nulterm(s, n) tor_memdup_nulterm_(s, n DMALLOC_ARGS) void tor_log_mallinfo(int severity); |