Changeset 43424 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

May 8, 2009, 6:01:16 PM (16 years ago)

Author:

[email protected]

Message:

Add a limited literal parser for eval to handle object and array literals fired at eval

Reviewed by Gavin Barraclough and Darin Adler.

This is a simplified parser and lexer that we can throw at strings passed to eval
in case a site is using eval to parse JSON (eg. json2.js). The lexer is intentionally
limited (in effect it's whitelisting a limited "common" subset of the JSON grammar)
as this decreases the likelihood of us wating time attempting to parse any significant
amount of non-JSON content.

Location:

trunk/JavaScriptCore/runtime

Files:

• JSGlobalObjectFunctions.cpp (modified) (2 diffs)
• LiteralParser.cpp (added)
• LiteralParser.h (added)

trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -29 +29 @@
 #include "GlobalEvalFunction.h"
 #include "JSGlobalObject.h"
+#include "LiteralParser.h"
 #include "JSString.h"
 #include "Interpreter.h"
@@ -282 +283 @@
     UString s = x.toString(exec);
 
+    LiteralParser preparser(exec, s);
+    if (JSValue parsedObject = preparser.tryLiteralParse())
+        return parsedObject;
+
     int errLine;
     UString errMsg;