summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Kulaychuk <i.kulaychuk@samsung.com>2018-04-20 23:52:57 +0300
committerGleb Balykov <g.balykov@samsung.com>2019-07-31 15:31:29 +0300
commit600ac76f73e05b1fd4e567986c07eb7962e9d7f9 (patch)
treed67f33c40272d818c13f8aacb752a88eea2ee88d
parent546b7f6baabf12f6948dbf203bb30227c5092097 (diff)
downloadcoreclr-600ac76f73e05b1fd4e567986c07eb7962e9d7f9.tar.gz
coreclr-600ac76f73e05b1fd4e567986c07eb7962e9d7f9.tar.bz2
coreclr-600ac76f73e05b1fd4e567986c07eb7962e9d7f9.zip
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 2be3781931..3f66ed5e90 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;
}