Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ChakraCore 2018-05 security updates #5116

Merged
merged 14 commits into from
May 8, 2018

Conversation

MSLaguana
Copy link
Contributor

No description provided.

@MSLaguana
Copy link
Contributor Author

MSLaguana commented May 8, 2018

@akroshg
Copy link
Contributor

akroshg commented May 8, 2018

LGTM

@sigatrev
Copy link
Contributor

sigatrev commented May 8, 2018

:shipit:

Meghana Gupta and others added 14 commits May 8, 2018 11:17
… - Internal

Move the stack walk that detects active functions in support of entry point expiration from PreCollectionCallBack to PreRescanMarkCallback. Fixes some cases where active functions are not marked as such, and their jitted code is freed while they're on the call stack.
Do not allow ScriptFunctionWithInlineCache to borrow its InlineCache* from the FunctionBody, because in certain cases of redeferral this will cause jitted code to access stale pointers. Instead of borrowing the caches from the FunctionBody, create a base ScriptFunction and let the runtime access the current FunctionBody inline caches when the function is executed.
…360Vulcan - Edge RCE Web Plat beta bounty on WIP
@sethbrenith
Copy link
Contributor

LGTM

ScriptFunction* pfuncScript = scriptContext->GetLibrary()->CreateScriptFunction(functionProxy);
pfuncScript->SetEnvironment(environment);
pfuncScript = scriptContext->GetLibrary()->CreateScriptFunction(functionProxy);
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the part of the change that requires additional logic for release/1.9 . We can synch up to manage that.

@chakrabot chakrabot merged commit ec2922b into chakra-core:release/1.8 May 8, 2018
chakrabot pushed a commit that referenced this pull request May 8, 2018
Merge pull request #5116 from MSLaguana:servicing/1805
@MSLaguana MSLaguana deleted the servicing/1805 branch May 8, 2018 20:12
@rajatd rajatd self-requested a review May 8, 2018 20:13
chakrabot pushed a commit that referenced this pull request May 8, 2018
Merge pull request #5116 from MSLaguana:servicing/1805
chakrabot pushed a commit that referenced this pull request May 8, 2018
…curity updates

Merge pull request #5116 from MSLaguana:servicing/1805
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.