summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Kulaychuk <i.kulaychuk@samsung.com>2018-04-20 20:52:57 (GMT)
committerGleb Balykov <g.balykov@samsung.com>2018-09-18 12:49:14 (GMT)
commit226dc8987a19db2c2abdaeb141c5e8ad6e1e6109 (patch)
tree576777991d72d29e9cb220ff5d000524f8ba6bd0
parentb3acda1a58e28cf4d9ddcad02fc6f1240f27d5b1 (diff)
downloadcoreclr-226dc8987a19db2c2abdaeb141c5e8ad6e1e6109.zip
coreclr-226dc8987a19db2c2abdaeb141c5e8ad6e1e6109.tar.gz
coreclr-226dc8987a19db2c2abdaeb141c5e8ad6e1e6109.tar.bz2
Fix EECodeManager::GetAmbientSP on x86/Linux
-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 593b44d..03bb0b1 100644
--- a/src/vm/eetwain.cpp
+++ b/src/vm/eetwain.cpp
@@ -6022,7 +6022,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;
}