summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Kulaychuk <i.kulaychuk@samsung.com>2018-04-20 23:52:57 +0300
committerGleb Balykov <g.balykov@samsung.com>2020-03-25 15:29:41 +0300
commit6102b547f1b41d100c3921dc5f593d1afa681845 (patch)
tree61b394295812cdac20017b63b0723fee22d09b87 /src
parent509498dee104c8552b869ca05a85846c918ac041 (diff)
downloadcoreclr-6102b547f1b41d100c3921dc5f593d1afa681845.tar.gz
coreclr-6102b547f1b41d100c3921dc5f593d1afa681845.tar.bz2
coreclr-6102b547f1b41d100c3921dc5f593d1afa681845.zip
Fix EECodeManager::GetAmbientSP on x86/Linux
Diffstat (limited to 'src')
-rw-r--r--src/vm/eetwain.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp
index f9735237fd..c0eb7aa8d0 100644
--- a/src/vm/eetwain.cpp
+++ b/src/vm/eetwain.cpp
@@ -6041,7 +6041,8 @@ TADDR EECodeManager::GetAmbientSP(PREGDISPLAY pContext,
#endif // _DEBUG && !DACCESS_COMPILE
if ((stateBuf->hdrInfoBody.prologOffs != hdrInfo::NOT_IN_PROLOG) ||
- (stateBuf->hdrInfoBody.epilogOffs != hdrInfo::NOT_IN_EPILOG))
+ (stateBuf->hdrInfoBody.epilogOffs != hdrInfo::NOT_IN_EPILOG) ||
+ (GetRegdisplayFPAddress(pContext) == NULL))
{
return NULL;
}