blob: 340a7061c54bea43d9ec8c92cda12645f813c48a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
From 4168f754bbb8d559de00f5a0d45660784968a1f9 Mon Sep 17 00:00:00 2001
From: Igor Kulaychuk <i.kulaychuk@samsung.com>
Date: Fri, 20 Apr 2018 23:52:57 +0300
Subject: [PATCH 13/13] Fix EECodeManager::GetAmbientSP on x86/Linux
---
src/vm/eetwain.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp
index a2ceb19..4fb43a9 100644
--- a/src/vm/eetwain.cpp
+++ b/src/vm/eetwain.cpp
@@ -5940,7 +5940,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;
}
--
2.7.4
|
