Changeset 15522 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 19, 2006, 12:06:13 AM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Adele Peterson.

<rdar://problem/4589530> REGRESSION: null character in JS string causes parse error (works in Tiger and in other browsers)

• kjs/lexer.cpp: (Lexer::shift): (Lexer::lex): (Lexer::record16): (Lexer::scanRegExp):
• kjs/lexer.h:

LayoutTests:

Reviewed by Adele Peterson.

Test case for:

<rdar://problem/4620646> REGRESSION(10.4.7-10.5): can't type into editing region when creating or editing a blogger.com post

• fast/js/null-char-in-string-expected.txt: Added.
• fast/js/null-char-in-string.html: Added.
• fast/js/resources/null-char-in-string.js: Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/lexer.cpp (modified) (6 diffs)
• kjs/lexer.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-18  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Adele Peterson.
+        
+        <rdar://problem/4589530> REGRESSION: null character in JS string causes parse error (works in Tiger and in other browsers)
+
+        * kjs/lexer.cpp:
+        (Lexer::shift):
+        (Lexer::lex):
+        (Lexer::record16):
+        (Lexer::scanRegExp):
+        * kjs/lexer.h:
+
 2006-07-18  Tim Omernick  <[email protected]>
 

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -126 +126 @@
     do {
       if (pos >= length) {
-        next3 = 0;
+        next3 = -1;
         break;
       }
@@ -189 +189 @@
         shift(1);
         state = InMultiLineComment;
-      } else if (current == 0) {
+      } else if (current == -1) {
         if (!terminator && !delimited) {
           // automatic semicolon insertion if program incomplete
@@ -246 +246 @@
         shift(1);
         setDone(String);
-      } else if (current == 0 || isLineTerminator()) {
+      } else if (isLineTerminator() || current == -1) {
         setDone(Bad);
       } else if (current == '\\') {
@@ -321 +321 @@
         } else
           state = Start;
-      } else if (current == 0) {
+      } else if (current == -1) {
         setDone(Eof);
       }
       break;
     case InMultiLineComment:
-      if (current == 0) {
+      if (current == -1) {
         setDone(Bad);
       } else if (isLineTerminator()) {
@@ -805 +805 @@
 }
 
+void Lexer::record16(int c)
+{
+  ASSERT(c >= 0);
+  ASSERT(c <= USHRT_MAX);
+  record16(UChar(static_cast<unsigned short>(c)));
+}
+
 void Lexer::record16(KJS::UChar c)
 {
@@ -826 +833 @@
 
   while (1) {
-    if (isLineTerminator() || current == 0)
+    if (isLineTerminator() || current == -1)
       return false;
     else if (current != '/' || lastWasEscape == true || inBrackets == true)

trunk/JavaScriptCore/kjs/lexer.h

@@ -134 +134 @@
 
     void record8(unsigned short c);
+    void record16(int c);
     void record16(UChar c);
 
@@ -147 +148 @@
     bool error;
 
-    // current and following unicode characters
-    unsigned short current, next1, next2, next3;
+    // current and following unicode characters (int to allow for -1 for end-of-file marker)
+    int current, next1, next2, next3;
 
     UString **strings;