summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Kulaychuk <i.kulaychuk@samsung.com>2018-04-20 20:52:57 (GMT)
committerAlexander Soldatov/AI Ecosystem Lab /SRR/Staff Engineer/삼성전자 <soldatov.a@samsung.com>2019-02-14 17:24:48 (GMT)
commit4177c7a92bed7cc0faad87f19bbf063fd90c8b68 (patch)
tree1323de6a38fc206f6bfb850bed214da89836710f
parentfde3d04e5a39b3f6ee695b1d9a20b77139a93893 (diff)
downloadcoreclr-4177c7a92bed7cc0faad87f19bbf063fd90c8b68.zip
coreclr-4177c7a92bed7cc0faad87f19bbf063fd90c8b68.tar.gz
coreclr-4177c7a92bed7cc0faad87f19bbf063fd90c8b68.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 2be3781..3f66ed5 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;
}