summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Vorlicek <janvorli@microsoft.com>2016-01-23 01:10:19 +0100
committerJan Vorlicek <janvorli@microsoft.com>2016-01-23 01:10:19 +0100
commit0227fbbc42c3df3bd3f9f1b905fe61a6caea1e32 (patch)
treed5bbd8632d5850034ac25f1d3420c0400a462ab3
parent431f7ff1150561a9d27e29c155706e279328446a (diff)
parentc698d112a79a910c427a08157269f24df7d4c917 (diff)
downloadcoreclr-0227fbbc42c3df3bd3f9f1b905fe61a6caea1e32.tar.gz
coreclr-0227fbbc42c3df3bd3f9f1b905fe61a6caea1e32.tar.bz2
coreclr-0227fbbc42c3df3bd3f9f1b905fe61a6caea1e32.zip
Merge pull request #2806 from janvorli/fix-stack-limit-check
Fix missing setting of ScanContext::stack_limit
-rw-r--r--src/vm/frames.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vm/frames.cpp b/src/vm/frames.cpp
index fd72903376..b2a9ebfced 100644
--- a/src/vm/frames.cpp
+++ b/src/vm/frames.cpp
@@ -1466,6 +1466,8 @@ BOOL TransitionFrame::Protects(OBJECTREF * ppORef)
{
WRAPPER_NO_CONTRACT;
IsObjRefProtectedScanContext sc (ppORef);
+ // Set the stack limit for the scan to the SP of the managed frame above the transition frame
+ sc.stack_limit = GetSP();
GcScanRoots (IsObjRefProtected, &sc);
return sc.oref_protected;
}