summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Kulaychuk <i.kulaychuk@samsung.com>2018-04-20 23:52:57 +0300
committer이형주/Tizen Platform Lab(SR)/Staff Engineer/삼성전자 <leee.lee@samsung.com>2018-07-06 09:22:08 +0900
commit7aeab19eb3fc04a9149ea12d3dbfeb6a2646e647 (patch)
tree4ed3fcd32e389dc0767a484027f10d5b34c6993f
parent1ab482c03987358a574d7d09edc587db62fe465f (diff)
downloadcoreclr-7aeab19eb3fc04a9149ea12d3dbfeb6a2646e647.tar.gz
coreclr-7aeab19eb3fc04a9149ea12d3dbfeb6a2646e647.tar.bz2
coreclr-7aeab19eb3fc04a9149ea12d3dbfeb6a2646e647.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 593b44d2df..03bb0b1402 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;
}