From 3cd2f88c398cfba986202a9766047b8fc231602d Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Wed, 30 Mar 2016 20:30:13 -0700 Subject: Fixed issue #3987 "Debugger fails to stop on entry due to stack walk failure" By initializing m_rgHijackFunction to NULL. --- src/debug/daccess/dacdbiimpl.cpp | 3 +++ src/debug/ee/debugger.cpp | 2 ++ 2 files changed, 5 insertions(+) (limited to 'src/debug') diff --git a/src/debug/daccess/dacdbiimpl.cpp b/src/debug/daccess/dacdbiimpl.cpp index 41ecde63ec..8ff1ecd9da 100644 --- a/src/debug/daccess/dacdbiimpl.cpp +++ b/src/debug/daccess/dacdbiimpl.cpp @@ -5081,6 +5081,9 @@ void DacDbiInterfaceImpl::Hijack( // (The hijack function already has the context) _ASSERTE((pOriginalContext == NULL) == (cbSizeContext == 0)); _ASSERTE(EHijackReason::IsValid(reason)); +#ifdef PLATFORM_UNIX + _ASSERTE(!"Not supported on this platform"); +#endif // // If we hijack a thread which might not be managed we can set vmThread = NULL diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp index 87ddb79678..12f87e381c 100644 --- a/src/debug/ee/debugger.cpp +++ b/src/debug/ee/debugger.cpp @@ -983,6 +983,7 @@ Debugger::Debugger() m_fShutdownMode = false; m_fDisabled = false; + m_rgHijackFunction = NULL; #ifdef _DEBUG InitDebugEventCounting(); @@ -17006,6 +17007,7 @@ Debugger::EnumMemoryRegions(CLRDataEnumMemoryFlags flags) { DAC_ENUM_VTHIS(); SUPPORTS_DAC; + _ASSERTE(m_rgHijackFunction != NULL); if ( flags != CLRDATA_ENUM_MEM_TRIAGE) { -- cgit v1.2.3