diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2014-09-25 20:47:10 +0000 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2014-09-25 20:47:10 +0000 |
| commit | 916b81bb1f5c1f59724c32c67d9b92d2730c0706 (patch) | |
| tree | ae991a0959d155d06c988592e73d4e46310e30b0 /lib/interception/interception_win.cc | |
| parent | 494410fabc24369cb7a58632ac93c571068d77a6 (diff) | |
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
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@218465 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/interception/interception_win.cc')
| -rw-r--r-- | lib/interception/interception_win.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/interception/interception_win.cc b/lib/interception/interception_win.cc index ecd5d2efa..cd241c3d2 100644 --- a/lib/interception/interception_win.cc +++ b/lib/interception/interception_win.cc @@ -182,7 +182,10 @@ bool OverrideFunction(uptr old_func, uptr new_func, uptr *orig_old_func) { } static const void **InterestingDLLsAvailable() { - const char *InterestingDLLs[] = { "kernel32.dll", "msvcr120.dll", NULL }; + const char *InterestingDLLs[] = {"kernel32.dll", + "msvcr110.dll", // VS2012 + "msvcr120.dll", // VS2013 + NULL}; static void *result[ARRAY_SIZE(InterestingDLLs)] = { 0 }; if (!result[0]) { for (size_t i = 0, j = 0; InterestingDLLs[i]; ++i) { |