Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
[Merge chakra-core/ChakraCore@860ad1275e] [MERGE #3719 @jianchun] fix…
Browse files Browse the repository at this point in the history
… JavascriptFunction::CheckValidDebugThunk CrossSite check

Merge pull request #3719 from jianchun:validdbgthunk

Comparing with scriptContext->CurrentCrossSiteThunk is unreliable. The
function being checked could be CrossSite and its context closed, thus
could be using a cross site thunk different to scriptContext's (note we
have 2 cross site thunks: DefaultThunk and ProfileThunk).

Change to CrossSite::IsThunk to cover both.

Fix OS#11699485
  • Loading branch information
chakrabot authored and MSLaguana committed Sep 25, 2017
1 parent 57b1462 commit c3abd0a
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ namespace Js
if (scriptContext->IsScriptContextInDebugMode()
&& !scriptContext->IsInterpreted() && !CONFIG_FLAG(ForceDiagnosticsMode) // Does not work nicely if we change the default settings.
&& function->GetEntryPoint() != scriptContext->CurrentThunk
&& function->GetEntryPoint() != scriptContext->CurrentCrossSiteThunk
&& !CrossSite::IsThunk(function->GetEntryPoint())
&& JavascriptFunction::Is(function))
{

Expand Down

0 comments on commit c3abd0a

Please sign in to comment.