[Merge chakra-core/ChakraCore@a9c6c2dc41] [1.6>1.7] [MERGE #3416 @cur…

…tisman] Fix Issue #3261: Need to detect invalid null character at the end of the source string Merge pull request #3416 from curtisman:fix3261
nodejs · Aug 10, 2017 · 68380ca · 68380ca
1 parent dfc1581
commit 68380ca
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/deps/chakrashim/core/bin/ch/WScriptJsrt.cpp b/deps/chakrashim/core/bin/ch/WScriptJsrt.cpp
@@ -945,7 +945,7 @@ bool WScriptJsrt::Initialize()
             ;
 
         JsValueRef $262ScriptRef;
-        IfJsrtErrorFailLogAndRetFalse(ChakraRTInterface::JsCreateStringUtf16((uint16_t*)$262, _countof($262), &$262ScriptRef));
+        IfJsrtErrorFailLogAndRetFalse(ChakraRTInterface::JsCreateStringUtf16((uint16_t*)$262, _countof($262) - 1, &$262ScriptRef));
 
         JsValueRef fname;
         IfJsrtErrorFailLogAndRetFalse(ChakraRTInterface::JsCreateString("$262", strlen("$262"), &fname));

diff --git a/deps/chakrashim/core/lib/Parser/Scan.cpp b/deps/chakrashim/core/lib/Parser/Scan.cpp
@@ -1147,7 +1147,7 @@ tokens Scanner<EncodingPolicy>::ScanStringConstant(OLECHAR delim, EncodedCharPtr
             goto LMainDefault;
 
         case kchNUL:
-            if (p >= last)
+            if (p > last)
             {
                 m_currentCharacter = p - 1;
                 Error(ERRnoStrEnd);
@@ -1723,14 +1723,14 @@ tokens Scanner<EncodingPolicy>::ScanCore(bool identifyKwds)
         case '\0':
             // Put back the null in case we get called again.
             p--;
-LEof:
-            token = tkEOF;
-
-            if (p + 1 < last)
+            if (p < last)
             {
                 // A \0 prior to the end of the text is an invalid character.
                 Error(ERRillegalChar);
             }
+LEof:
+            Assert(p >= last);
+            token = tkEOF;
             break;
 
         case 0x0009:
@@ -2031,7 +2031,10 @@ tokens Scanner<EncodingPolicy>::ScanCore(bool identifyKwds)
                         m_parser->ReduceDeferredScriptLength((ULONG)(p - m_pchMinTok));
                         break;
                     case kchNUL:
-                        if (p >= last)
+                        // Because we used ReadFirst, we have advanced p. The character that we are looking at is actually is p - 1.
+                        // If p == last, we are looking at p - 1, it is still within the source buffer, and we need to consider it part of the comment
+                        // Only if p > last that we have pass the source buffer and consider it a line break
+                        if (p > last)
                         {
                             p--;
                             goto LCommentLineBreak;

diff --git a/deps/chakrashim/core/test/GlobalFunctions/evalNullsNewlines.baseline b/deps/chakrashim/core/test/GlobalFunctions/evalNullsNewlines.baseline
@@ -5,3 +5,4 @@
 SyntaxError: Invalid character
 1
 1
+SyntaxError: Invalid character
diff --git a/deps/chakrashim/core/test/GlobalFunctions/evalNullsNewlines.js b/deps/chakrashim/core/test/GlobalFunctions/evalNullsNewlines.js
@@ -14,10 +14,11 @@ function write(str) {
     }
 }
 
-write("--- 1 ---");                                                                   // CHROME          IE8
-try { write(eval('1+//\0\n1')); } catch (e) { write(e); }                             // 2               !
-try { write(eval('"a\0b"').length); } catch (e) { write(e); }                         // 3               !
-try { write(eval('\'a\0b\'').length); } catch (e) { write(e); }                       // 3               !
-try { write(eval('\0 = 1')); } catch (e) { write(e); }                                // !               undefined
-try { write(eval('/*\0*/1')); } catch (e) { write(e); }                               // 1               !
-try { write(eval('1//\0')); } catch (e) { write(e); }                                 // 1               1
+write("--- 1 ---");                                                               
+try { write(eval('1+//\0\n1')); } catch (e) { write(e); }                             // 2      
+try { write(eval('"a\0b"').length); } catch (e) { write(e); }                         // 3       
+try { write(eval('\'a\0b\'').length); } catch (e) { write(e); }                       // 3         
+try { write(eval('\0 = 1')); } catch (e) { write(e); }                                // !          
+try { write(eval('/*\0*/1')); } catch (e) { write(e); }                               // 1              
+try { write(eval('1//\0')); } catch (e) { write(e); }                                 // 1               
+try { write(eval('1\0')); } catch (e) { write(e); }                                 // !