deps: update ChakraCore to chakra-core/ChakraCore@51c6097dd4

[MERGE #5569 @aneeshdk] OS:18468078:Adding a check for the case where lambda method accessing super in global scope Merge pull request #5569 from aneeshdk:SuperGlobalAccessIssue When a labmda method access super property in the global scope the currentnonlambdafunc will be nullptr. This should be a SyntaxError. Reviewed-By: chakrabot <[email protected]>
nodejs · Aug 16, 2018 · 586cde9 · 586cde9
1 parent 28a6c92
commit 586cde9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/deps/chakrashim/core/lib/Parser/Parse.cpp b/deps/chakrashim/core/lib/Parser/Parse.cpp
@@ -12323,7 +12323,7 @@ IdentPtr Parser::ParseSuper(bool fAllowCall)
     {
         // Any super access is good within a class constructor
     }
-    else if ((this->m_grfscr & fscrEval) == fscrEval || currentNonLambdaFunc->superRestrictionState == SuperRestrictionState::PropertyAllowed)
+    else if ((this->m_grfscr & fscrEval) == fscrEval || (currentNonLambdaFunc != nullptr && currentNonLambdaFunc->superRestrictionState == SuperRestrictionState::PropertyAllowed))
     {
         // Currently for eval cases during compile time we use propertyallowed and throw during runtime for error cases
         if (m_token.tk == tkLParen)

diff --git a/deps/chakrashim/core/test/Bugs/SuperAccessInGlobalLambda.baseline b/deps/chakrashim/core/test/Bugs/SuperAccessInGlobalLambda.baseline
@@ -0,0 +1,2 @@
+SyntaxError: Invalid use of the 'super' keyword
+	at code (SuperAccessInGlobalLambda.js:6:12)
diff --git a/deps/chakrashim/core/test/Bugs/SuperAccessInGlobalLambda.js b/deps/chakrashim/core/test/Bugs/SuperAccessInGlobalLambda.js
@@ -0,0 +1,6 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+
+() => super.a;
diff --git a/deps/chakrashim/core/test/Bugs/rlexe.xml b/deps/chakrashim/core/test/Bugs/rlexe.xml
@@ -523,4 +523,11 @@
       <compile-flags>-force:cachedScope</compile-flags>
     </default>
   </test>
+  <test>
+    <default>
+      <files>SuperAccessInGlobalLambda.js</files>
+      <baseline>SuperAccessInGlobalLambda.baseline</baseline>
+      <tags>exclude_jshost</tags>
+    </default>
+  </test>
 </regress-exe>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		SyntaxError: Invalid use of the 'super' keyword
		at code (SuperAccessInGlobalLambda.js:6:12)