[CVE-2019-0937]

pleath · MikeHolman · commit 7827e1177530 · 2019-05-13T11:05:39.000-07:00
diff --git a/lib/Runtime/ByteCode/ByteCodeEmitter.cpp b/lib/Runtime/ByteCode/ByteCodeEmitter.cpp
@@ -4006,6 +4006,11 @@ void ByteCodeGenerator::StartEmitCatch(ParseNodeCatch *pnodeCatch)
                 sym->SetIsGlobalCatch(true);
             }
 
+            if (sym->NeedsScopeObject())
+            {
+                scope->SetIsObject();
+            }
+
             Assert(sym->GetScopeSlot() == Js::Constants::NoProperty);
             if (sym->NeedsSlotAlloc(this, funcInfo))
             {
@@ -4029,6 +4034,11 @@ void ByteCodeGenerator::StartEmitCatch(ParseNodeCatch *pnodeCatch)
             sym->SetIsGlobalCatch(true);
         }
 
+        if (sym->NeedsScopeObject())
+        {
+            scope->SetIsObject();
+        }
+
         if (scope->GetMustInstantiate())
         {
             if (sym->IsInSlot(this, funcInfo))

Original file line number	Diff line number	Diff line change
`@@ -4006,6 +4006,11 @@ void ByteCodeGenerator::StartEmitCatch(ParseNodeCatch *pnodeCatch)`
`4006`	`4006`	`sym->SetIsGlobalCatch(true);`
`4007`	`4007`	`}`
`4008`	`4008`
	`4009`	`+ if (sym->NeedsScopeObject())`
	`4010`	`+ {`
	`4011`	`+ scope->SetIsObject();`
	`4012`	`+ }`
	`4013`	`+`
`4009`	`4014`	`Assert(sym->GetScopeSlot() == Js::Constants::NoProperty);`
`4010`	`4015`	`if (sym->NeedsSlotAlloc(this, funcInfo))`
`4011`	`4016`	`{`
`@@ -4029,6 +4034,11 @@ void ByteCodeGenerator::StartEmitCatch(ParseNodeCatch *pnodeCatch)`
`4029`	`4034`	`sym->SetIsGlobalCatch(true);`
`4030`	`4035`	`}`
`4031`	`4036`
	`4037`	`+ if (sym->NeedsScopeObject())`
	`4038`	`+ {`
	`4039`	`+ scope->SetIsObject();`
	`4040`	`+ }`
	`4041`	`+`
`4032`	`4042`	`if (scope->GetMustInstantiate())`
`4033`	`4043`	`{`
`4034`	`4044`	`if (sym->IsInSlot(this, funcInfo))`