diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2016-03-30 20:34:15 -0700 |
|---|---|---|
| committer | Mike McLaughlin <mikem@microsoft.com> | 2016-03-30 20:34:15 -0700 |
| commit | 184a61dd82d7da989d630dcdbcecdb1b9c3e316e (patch) | |
| tree | e47f14f240afed8566ab3711fa3a31246449a6be | |
| parent | 1bc24d14dce4876197492211f4989b656f08aedb (diff) | |
| parent | 3cd2f88c398cfba986202a9766047b8fc231602d (diff) | |
| download | coreclr-184a61dd82d7da989d630dcdbcecdb1b9c3e316e.tar.gz coreclr-184a61dd82d7da989d630dcdbcecdb1b9c3e316e.tar.bz2 coreclr-184a61dd82d7da989d630dcdbcecdb1b9c3e316e.zip | |
Merge pull request #4017 from mikem8361/issue3987
Fixed issue #3987 "Debugger fails to stop on entry due to stack walk failure"
| -rw-r--r-- | src/debug/daccess/dacdbiimpl.cpp | 3 | ||||
| -rw-r--r-- | src/debug/ee/debugger.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
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) { |