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

ChakraCore servicing update for 19-11 #6328

Merged
merged 4 commits into from
Nov 12, 2019
Merged

ChakraCore servicing update for 19-11 #6328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b67808c
[CVE-2019-1427]
MikeHolman Oct 7, 2019
d2de5fe
[CVE-2019-1428]
boingoing Oct 9, 2019
fd5d5cf
[CVE-2019-1426]
pleath Sep 9, 2019
ab9165a
Update version to 1.11.15
boingoing Oct 9, 2019
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
2 changes: 1 addition & 1 deletion Build/NuGet/.pack-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.14
1.11.15
3 changes: 2 additions & 1 deletion lib/Backend/GlobOptFields.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ GlobOpt::KillLiveElems(IR::IndirOpnd * indirOpnd, IR::Opnd * valueOpnd, BVSparse
IR::RegOpnd *baseOpnd = indirOpnd->GetBaseOpnd();
Value * baseValue = baseOpnd ? this->currentBlock->globOptData.FindValue(baseOpnd->m_sym) : nullptr;
ValueInfo * baseValueInfo = baseValue ? baseValue->GetValueInfo() : nullptr;
if (!baseValueInfo || !baseValueInfo->IsNotNativeArray())
if (!baseValueInfo || !baseValueInfo->IsNotNativeArray() ||
(this->IsLoopPrePass() && !this->IsSafeToTransferInPrepass(baseOpnd->m_sym, baseValueInfo)))
{
if (this->currentBlock->globOptData.maybeWrittenTypeSyms == nullptr)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Backend/GlobOptIntBounds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ void GlobOpt::TrackIntSpecializedAddSubConstant(

// Ensure that the sym is live in the landing pad, and that its value has not changed in an unknown way yet
Value *const landingPadValue = currentBlock->loop->landingPad->globOptData.FindValue(sym);
if(!landingPadValue || srcValueNumber != landingPadValue->GetValueNumber())
if(!landingPadValue || srcValueNumber != landingPadValue->GetValueNumber() || currentBlock->loop->symsDefInLoop->Test(sym->m_id))
{
updateInductionVariableValueNumber = false;
break;
Expand Down
2 changes: 1 addition & 1 deletion lib/Common/ChakraCoreVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// ChakraCore version number definitions (used in ChakraCore binary metadata)
#define CHAKRA_CORE_MAJOR_VERSION 1
#define CHAKRA_CORE_MINOR_VERSION 11
#define CHAKRA_CORE_PATCH_VERSION 14
#define CHAKRA_CORE_PATCH_VERSION 15
#define CHAKRA_CORE_VERSION_RELEASE_QFE 0 // Redundant with PATCH_VERSION. Keep this value set to 0.

// -------------
Expand Down
9 changes: 9 additions & 0 deletions lib/Parser/Parse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9506,6 +9506,15 @@ ParseNodeCatch * Parser::ParseCatch()
GetCurrentBlock()->SetChildCallsEval(true);
}

if (pnodeCatchScope->GetCallsEval())
{
pnodeBody->AsParseNodeBlock()->SetCallsEval(true);
}
if (pnodeCatchScope->GetChildCallsEval())
{
pnodeBody->AsParseNodeBlock()->SetChildCallsEval(true);
}

if (buildAST)
{
PopStmt(&stmt);
Expand Down