Changeset 9558 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Jul 1, 2005, 10:47:12 AM (20 years ago)

Author:

ggaren

Message:

-fixed <rdar://problem/4168186> JavaScript fails to throw exceptions
for invalid return statements

relevant tests:

ecma/Statements/12.9-1-n.js
ecma_2/Exceptions/lexical-052.js
ecma_2/Exceptions/statement-009.js

Reviewed by sullivan.

• kjs/nodes.cpp: (ReturnNode::execute): now throws exception if return is not inside a function.

• tests/mozilla/expected.html: updated to reflect fix

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -2226 +2226 @@
   KJS_BREAKPOINT;
 
+  CodeType codeType = exec->context().imp()->codeType();
+  if (codeType != FunctionCode && codeType != AnonymousCode ) {
+    return Completion(Throw, throwError(exec, SyntaxError, "Invalid return statement."));    
+  }
+
   if (!value)
     return Completion(ReturnValue, Undefined());