From 80db37ec254a3e5b96fe435555a16c40c6b0c217 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 24 Oct 2017 18:22:07 +0000 Subject: [PATCH] [asan] Add more x86 prologue decodings to handle x64 VC 2017 CRT Fixes atoi and strtol interception. llvm-svn: 316482 --- compiler-rt/lib/interception/interception_win.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler-rt/lib/interception/interception_win.cc b/compiler-rt/lib/interception/interception_win.cc index 3e593c9..23402e5 100644 --- a/compiler-rt/lib/interception/interception_win.cc +++ b/compiler-rt/lib/interception/interception_win.cc @@ -553,7 +553,10 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) { case 0x246c8948: // 48 89 6C 24 XX : mov QWORD ptr [rsp + XX], rbp case 0x245c8948: // 48 89 5c 24 XX : mov QWORD PTR [rsp + XX], rbx case 0x24748948: // 48 89 74 24 XX : mov QWORD PTR [rsp + XX], rsi + case 0x244C8948: // 48 89 4C 24 XX : mov QWORD PTR [rsp + XX], rcx return 5; + case 0x24648348: // 48 83 64 24 XX : and QWORD PTR [rsp + XX], YY + return 6; } #else -- 2.7.4