summaryrefslogtreecommitdiff
path: root/lib/asan/asan_win_dll_thunk.cc
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2016-03-21 23:51:17 +0000
committerReid Kleckner <rnk@google.com>2016-03-21 23:51:17 +0000
commit13125190e833027254623590dbdd9cf4cfa658c1 (patch)
tree7cf8add4ee8684d8c61ddef43e7c7b3ea06484c1 /lib/asan/asan_win_dll_thunk.cc
parent312b78803d98dad8c697c328ad5dff78abcafb0c (diff)
downloadcompiler-rt-13125190e833027254623590dbdd9cf4cfa658c1.tar.gz
[asan] Add new _*_base interceptors for VS 2015
There are some places in the CRT (such as mbctype) that directly call _malloc_base. If you are incrementally linking a binary with ASan from before this change, this change appears to result in a linker error. Retrying the link succeeds for some reason. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@264005 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_win_dll_thunk.cc')
-rw-r--r--lib/asan/asan_win_dll_thunk.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/asan/asan_win_dll_thunk.cc b/lib/asan/asan_win_dll_thunk.cc
index fea5a2ec6..6d25425ed 100644
--- a/lib/asan/asan_win_dll_thunk.cc
+++ b/lib/asan/asan_win_dll_thunk.cc
@@ -347,16 +347,20 @@ INTERFACE_FUNCTION(__sanitizer_verify_contiguous_container)
// ----------------- Memory allocation functions ---------------------
WRAP_V_W(free)
+WRAP_V_W(_free_base)
WRAP_V_WW(_free_dbg)
WRAP_W_W(malloc)
+WRAP_W_W(_malloc_base)
WRAP_W_WWWW(_malloc_dbg)
WRAP_W_WW(calloc)
+WRAP_W_WW(_calloc_base)
WRAP_W_WWWWW(_calloc_dbg)
WRAP_W_WWW(_calloc_impl)
WRAP_W_WW(realloc)
+WRAP_W_WW(_realloc_base)
WRAP_W_WWW(_realloc_dbg)
WRAP_W_WWW(_recalloc)