[compiler-rt] r316482 - [asan] Add more x86 prologue decodings to handle x64 VC 2017 CRT

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Tue Oct 24 11:22:07 2017
New Revision: 316482

URL: http://llvm.org/viewvc/llvm-project?rev=316482&view=rev
Log:
[asan] Add more x86 prologue decodings to handle x64 VC 2017 CRT

Fixes atoi and strtol interception.

Modified:
    compiler-rt/trunk/lib/interception/interception_win.cc

Modified: compiler-rt/trunk/lib/interception/interception_win.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/interception_win.cc?rev=316482&r1=316481&r2=316482&view=diff
==============================================================================
--- compiler-rt/trunk/lib/interception/interception_win.cc (original)
+++ compiler-rt/trunk/lib/interception/interception_win.cc Tue Oct 24 11:22:07 2017
@@ -553,7 +553,10 @@ static size_t GetInstructionSize(uptr ad
     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