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.

Sign up for GitHub

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

Jump to bottom

January 2019 servicing update #5899

Merged
merged 2 commits into from
Jan 8, 2019
Merged

January 2019 servicing update #5899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d73c5f1
CVE-2019-0568 Edge - Chakra: JIT: JsBuiltInEngineInterfaceExtensionOb…
rajatd Dec 12, 2018
788f17b
CVE-2019-0539, CVE-2019-0567 Edge - Chakra: JIT: Type confusion via N…
Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/Backend/GlobOptFields.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,15 @@ GlobOpt::ProcessFieldKills(IR::Instr *instr, BVSparse<JitArenaAllocator> *bv, bo
}
break;

case Js::OpCode::InitClass:
case Js::OpCode::InitProto:
case Js::OpCode::NewScObjectNoCtor:
if (inGlobOpt)
{
KillObjectHeaderInlinedTypeSyms(this->currentBlock, false);
}
break;

default:
if (instr->UsesAllFields())
{
Expand Down
36 changes: 28 additions & 8 deletions lib/Runtime/Library/JsBuiltInEngineInterfaceExtensionObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,26 @@ namespace Js
{
return;
}

struct AutoRestoreFlags
{
ThreadContext * ctx;
ImplicitCallFlags savedImplicitCallFlags;
DisableImplicitFlags savedDisableImplicitFlags;
AutoRestoreFlags(ThreadContext *ctx, Js::ImplicitCallFlags implFlags, DisableImplicitFlags disableImplFlags) :
ctx(ctx),
savedImplicitCallFlags(implFlags),
savedDisableImplicitFlags(disableImplFlags)
{
ctx->ClearDisableImplicitFlags();
}

~AutoRestoreFlags()
{
ctx->SetImplicitCallFlags((Js::ImplicitCallFlags)(savedImplicitCallFlags));
ctx->SetDisableImplicitFlags((DisableImplicitFlags)savedDisableImplicitFlags);
}
};

try {
EnsureJsBuiltInByteCode(scriptContext);
Expand Down Expand Up @@ -138,19 +158,19 @@ namespace Js
scriptContext->GetThreadContext()->SetNoJsReentrancy(false);
#endif
// Clear disable implicit call bit as initialization code doesn't have any side effect
Js::ImplicitCallFlags saveImplicitCallFlags = scriptContext->GetThreadContext()->GetImplicitCallFlags();
scriptContext->GetThreadContext()->ClearDisableImplicitFlags();
JavascriptFunction::CallRootFunctionInScript(functionGlobal, Js::Arguments(callInfo, args));
scriptContext->GetThreadContext()->SetImplicitCallFlags((Js::ImplicitCallFlags)(saveImplicitCallFlags));
{
AutoRestoreFlags autoRestoreFlags(scriptContext->GetThreadContext(), scriptContext->GetThreadContext()->GetImplicitCallFlags(), scriptContext->GetThreadContext()->GetDisableImplicitFlags());
JavascriptFunction::CallRootFunctionInScript(functionGlobal, Js::Arguments(callInfo, args));
}

Js::ScriptFunction *functionBuiltins = scriptContext->GetLibrary()->CreateScriptFunction(jsBuiltInByteCode->GetNestedFunctionForExecution(0));
functionBuiltins->SetPrototype(scriptContext->GetLibrary()->nullValue);

// Clear disable implicit call bit as initialization code doesn't have any side effect
saveImplicitCallFlags = scriptContext->GetThreadContext()->GetImplicitCallFlags();
scriptContext->GetThreadContext()->ClearDisableImplicitFlags();
JavascriptFunction::CallRootFunctionInScript(functionBuiltins, Js::Arguments(callInfo, args));
scriptContext->GetThreadContext()->SetImplicitCallFlags((Js::ImplicitCallFlags)(saveImplicitCallFlags));
{
AutoRestoreFlags autoRestoreFlags(scriptContext->GetThreadContext(), scriptContext->GetThreadContext()->GetImplicitCallFlags(), scriptContext->GetThreadContext()->GetDisableImplicitFlags());
JavascriptFunction::CallRootFunctionInScript(functionBuiltins, Js::Arguments(callInfo, args));
}

InitializePrototypes(scriptContext);
#if DBG_DUMP
Expand Down