Changeset 16542 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 23, 2006, 11:08:18 AM (19 years ago)

Author:

ap

Message:

Reviewed by Maciej.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=10183
REGRESSION: obfuscated JS decoding breaks because of soft hyphen removal
(Fanfiction.net author pages not listing stories)

Rolled out the fix for bug 4139.

• kjs/lexer.cpp: (Lexer::setCode): (Lexer::shift):
• tests/mozilla/ecma/Array/15.4.5.1-1.js:
• tests/mozilla/expected.html:

2006-09-22 Steve Falkenburg <​[email protected]>

File:

• trunk/JavaScriptCore/kjs/lexer.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -115 +115 @@
 
   // read first characters
-  shift(4);
+  current = (length > 0) ? code[0].uc : -1;
+  next1 = (length > 1) ? code[1].uc : -1;
+  next2 = (length > 2) ? code[2].uc : -1;
+  next3 = (length > 3) ? code[3].uc : -1;
 }
 
 void Lexer::shift(unsigned int p)
 {
+  // Here would be a good place to strip Cf characters, but that has caused compatibility problems:
+  // <http://bugzilla.opendarwin.org/show_bug.cgi?id=10183>.
   while (p--) {
+    pos++;
     current = next1;
     next1 = next2;
     next2 = next3;
-    do {
-      if (pos >= length) {
-        next3 = -1;
-        break;
-      }
-      next3 = code[pos++].uc;
-    } while (WTF::Unicode::isFormatChar(next3));
+    next3 = (pos + 3 < length) ? code[pos+3].uc : -1;
   }
 }