diff options
author | Yang Tse <yangsita@gmail.com> | 2013-03-25 03:15:52 +0100 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2013-03-25 03:32:47 +0100 |
commit | 8ec2cb5544b86306b702484ea785b6b9596562ab (patch) | |
tree | 55952aea963b504165c3246768c93b21d6375958 /lib/memdebug.c | |
parent | c5eabd48e8dbc8393723bb79f0040475d850f389 (diff) | |
download | curl-8ec2cb5544b86306b702484ea785b6b9596562ab.tar.gz |
WIN32 MemoryTracking: track wcsdup() _wcsdup() and _tcsdup() usage
As of 25-mar-2013 wcsdup() _wcsdup() and _tcsdup() are only used in
WIN32 specific code, so tracking of these has not been extended for
other build targets. Without this fix, memory tracking system on
WIN32 builds, when using these functions, would provide misleading
results.
In order to properly extend this support for all targets curl.h
would have to define curl_wcsdup_callback prototype and consequently
wchar_t should be visible before that in curl.h. IOW curl_wchar_t
defined in curlbuild.h and this pulling whatever system header is
required to get wchar_t definition.
Additionally a new curl_global_init_mem() function that also receives
user defined wcsdup() callback would be required.
Diffstat (limited to 'lib/memdebug.c')
-rw-r--r-- | lib/memdebug.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/lib/memdebug.c b/lib/memdebug.c index 4d5f44d2f..b3ddfb430 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -239,6 +239,32 @@ char *curl_dostrdup(const char *str, int line, const char *source) return mem; } +#ifdef WIN32 +wchar_t *curl_dowcsdup(const wchar_t *str, int line, const char *source) +{ + wchar_t *mem; + size_t wsiz, bsiz; + + assert(str != NULL); + + if(countcheck("wcsdup", line, source)) + return NULL; + + wsiz = wcslen(str) + 1; + bsiz = wsiz * sizeof(wchar_t); + + mem = curl_domalloc(bsiz, 0, NULL); /* NULL prevents logging */ + if(mem) + memcpy(mem, str, bsiz); + + if(source) + curl_memlog("MEM %s:%d wcsdup(%p) (%zu) = %p\n", + source, line, str, bsiz, mem); + + return mem; +} +#endif + /* We provide a realloc() that accepts a NULL as pointer, which then performs a malloc(). In order to work with ares. */ void *curl_dorealloc(void *ptr, size_t wantedsize, |