diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-26 01:57:11 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-26 01:57:11 +0300 |
commit | 4429fefcaf8c4fec3deb915e301c95d6a8052ad9 (patch) | |
tree | 4ac42427aa749bdaeed9ee2578994aeb77c5c66b | |
parent | 1ddcf4cbfaf55a2a3561b9655fd7340d31667a1b (diff) |
Revert "Fix 54025 (#54070)" (#54729)
This reverts commit b2fe6678282503374aeea7ab5f468f7a3cc85a2f.
Co-authored-by: Juan Hoyos <juan.hoyos@microsoft.com>
-rw-r--r-- | src/coreclr/debug/ee/controller.cpp | 3 | ||||
-rw-r--r-- | src/coreclr/debug/ee/controller.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/coreclr/debug/ee/controller.cpp b/src/coreclr/debug/ee/controller.cpp index eed3c453e78..831dc2dd5b4 100644 --- a/src/coreclr/debug/ee/controller.cpp +++ b/src/coreclr/debug/ee/controller.cpp @@ -4412,9 +4412,8 @@ DebuggerPatchSkip::DebuggerPatchSkip(Thread *thread, } else { - _ASSERTE(m_instrAttrib.m_cOperandSize <= SharedPatchBypassBuffer::cbBufferBypass); // Copy the data into our buffer. - memcpy(bufferBypass, patch->address + m_instrAttrib.m_cbInstr + dwOldDisp, m_instrAttrib.m_cOperandSize); + memcpy(bufferBypass, patch->address + m_instrAttrib.m_cbInstr + dwOldDisp, SharedPatchBypassBuffer::cbBufferBypass); if (m_instrAttrib.m_fIsWrite) { diff --git a/src/coreclr/debug/ee/controller.h b/src/coreclr/debug/ee/controller.h index 9fe0a67e3ea..9bcfc8682f7 100644 --- a/src/coreclr/debug/ee/controller.h +++ b/src/coreclr/debug/ee/controller.h @@ -288,7 +288,7 @@ public: // "PatchBypass" must be the first field of this class for alignment to be correct. BYTE PatchBypass[MAX_INSTRUCTION_LENGTH]; #if defined(TARGET_AMD64) - const static int cbBufferBypass = 0x20; + const static int cbBufferBypass = 0x10; BYTE BypassBuffer[cbBufferBypass]; UINT_PTR RipTargetFixup; |