Skip to content

Commit 5bb7234

Browse files
committed
Add support for intercepting functions from msvcr110.dll
Summary: This finishes support for ASAN on MSVC2012. Test Plan: |ninja check-asan| passes locally with this on MSVC2012. Reviewers: timurrrr Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D5494 llvm-svn: 218465
1 parent 045423f commit 5bb7234

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

compiler-rt/lib/interception/interception_win.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,10 @@ bool OverrideFunction(uptr old_func, uptr new_func, uptr *orig_old_func) {
182182
}
183183

184184
static const void **InterestingDLLsAvailable() {
185-
const char *InterestingDLLs[] = { "kernel32.dll", "msvcr120.dll", NULL };
185+
const char *InterestingDLLs[] = {"kernel32.dll",
186+
"msvcr110.dll", // VS2012
187+
"msvcr120.dll", // VS2013
188+
NULL};
186189
static void *result[ARRAY_SIZE(InterestingDLLs)] = { 0 };
187190
if (!result[0]) {
188191
for (size_t i = 0, j = 0; InterestingDLLs[i]; ++i) {

0 commit comments

Comments
 (0)