Changeset 106512 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Feb 1, 2012, 4:08:00 PM (13 years ago)

Author:

[email protected]

Message:

calling function on catch block scope containing an eval result in wrong this value being passed
​https://bugs.webkit.org/show_bug.cgi?id=77581

Reviewed by Oliver Hunt.

javascript:function F(){ return 'F' in this; }; try { throw F; } catch (e) { eval(""); alert(e()); }

Source/JavaScriptCore:

• bytecompiler/NodesCodegen.cpp:

(JSC::TryNode::emitBytecode):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::execute):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createTryStatement):

• parser/NodeConstructors.h:

(JSC::TryNode::TryNode):

• parser/Nodes.h:

(TryNode):

• parser/Parser.cpp:

(JSC::::parseTryStatement):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createTryStatement):

• runtime/JSObject.h:

(JSObject):
(JSC::JSObject::isStaticScopeObject):
(JSC):

LayoutTests:

• fast/js/eval-var-decl-expected.txt:
• fast/js/script-tests/eval-var-decl.js:

(checkThis):
(testEvalInCatch):

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -604 +604 @@
     TreeStatement tryBlock = 0;
     const Identifier* ident = &m_globalData->propertyNames->nullIdentifier;
-    bool catchHasEval = false;
     TreeStatement catchBlock = 0;
     TreeStatement finallyBlock = 0;
@@ -627 +626 @@
         consumeOrFail(CLOSEPAREN);
         matchOrFail(OPENBRACE);
-        int initialEvalCount = context.evalCount();
         catchBlock = parseBlockStatement(context);
         failIfFalseWithMessage(catchBlock, "'try' must have a catch or finally block");
-        catchHasEval = initialEvalCount != context.evalCount();
         failIfFalse(popScope(catchScope, TreeBuilder::NeedsFreeVariableInfo));
     }
@@ -641 +638 @@
     }
     failIfFalse(catchBlock || finallyBlock);
-    return context.createTryStatement(m_lexer->lastLineNumber(), tryBlock, ident, catchHasEval, catchBlock, finallyBlock, firstLine, lastLine);
+    return context.createTryStatement(m_lexer->lastLineNumber(), tryBlock, ident, catchBlock, finallyBlock, firstLine, lastLine);
 }