Changeset 62727 in webkit

Timestamp:

Jul 7, 2010 4:27:57 PM (14 years ago)

Author:

oliver@apple.com

Message:

2010-07-07 Oliver Hunt <​oliver@apple.com>

Reviewed by Geoffrey Garen.

Lazy mode of parser allows invalid syntax in object literals.
​https://bugs.webkit.org/show_bug.cgi?id=41809

Make the parser itself validate getter and setter syntax rather
than offloading it to the AST builder.

• parser/ASTBuilder.h: (JSC::ASTBuilder::createGetterOrSetterProperty):
• parser/JSParser.cpp: (JSC::JSParser::parseProperty):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/ASTBuilder.h (modified) (1 diff)
• parser/JSParser.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-07-07  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Lazy mode of parser allows invalid syntax in object literals.
+        https://bugs.webkit.org/show_bug.cgi?id=41809
+
+        Make the parser itself validate getter and setter syntax rather
+        than offloading it to the AST builder.
+
+        * parser/ASTBuilder.h:
+        (JSC::ASTBuilder::createGetterOrSetterProperty):
+        * parser/JSParser.cpp:
+        (JSC::JSParser::parseProperty):
+
 2010-07-07  Dumitru Daniliuc  <dumi@chromium.org>
 

trunk/JavaScriptCore/parser/ASTBuilder.h

@@ -254 +254 @@
         ASSERT(name);
         PropertyNode::Type type;
-        if (*getOrSet == "get")
+        if (*getOrSet == m_globalData->propertyNames->get)
             type = PropertyNode::Getter;
-        else if (*getOrSet == "set")
+        else if (*getOrSet == m_globalData->propertyNames->set)
             type = PropertyNode::Setter;
         else

trunk/JavaScriptCore/parser/JSParser.cpp

@@ -1169 +1169 @@
         int closeBracePos = 0;
         int bodyStartLine = 0;
+        failIfFalse(*ident == m_globalData->propertyNames->get || *ident == m_globalData->propertyNames->set);
         failIfFalse(parseFunctionInfo<FunctionNeedsName>(context, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine));
         return context.createGetterOrSetterProperty(ident, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine, m_lastLine);