Changeset 61588 in webkit for trunk/JavaScriptCore/runtime/Executable.cpp

Timestamp:

Jun 21, 2010, 4:17:48 PM (15 years ago)

Author:

[email protected]

Message:

2010-06-21 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

Make JSC more resilient in the face of parse failures
​https://bugs.webkit.org/show_bug.cgi?id=40951

A number of recent bugs have occurred due to issues like miscounting
BOMs, etc which lead to interesting crashes later on. Adding this
logic hardens JSC in the face of these errors, and has no impact on
performance (32bit jit actually gets 0.7% faster but I put that down
to cache effects).

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::reparseForExceptionInfoIfNecessary): (JSC::CodeBlock::lineNumberForBytecodeOffset): (JSC::CodeBlock::expressionRangeForBytecodeOffset): (JSC::CodeBlock::getByIdExceptionInfoForBytecodeOffset):
• bytecode/CodeBlock.h: (JSC::CodeBlock::bytecodeOffset):
• interpreter/Interpreter.cpp: (JSC::Interpreter::execute): (JSC::Interpreter::executeCall): (JSC::Interpreter::executeConstruct): (JSC::Interpreter::prepareForRepeatCall): (JSC::Interpreter::privateExecute):
• jit/JITOpcodes.cpp: (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JITOpcodes32_64.cpp: (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION):
• runtime/ArrayPrototype.cpp: (JSC::isNumericCompareFunction):
• runtime/Executable.cpp: (JSC::FunctionExecutable::compileForCall): (JSC::FunctionExecutable::compileForConstruct): (JSC::FunctionExecutable::generateJITCodeForCall): (JSC::FunctionExecutable::generateJITCodeForConstruct): (JSC::FunctionExecutable::reparseExceptionInfo): (JSC::EvalExecutable::reparseExceptionInfo):
• runtime/Executable.h: (JSC::FunctionExecutable::bytecodeForCall): (JSC::FunctionExecutable::bytecodeForConstruct):
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::numericCompareFunction):

File:

• trunk/JavaScriptCore/runtime/Executable.cpp (modified) (7 diffs)

trunk/JavaScriptCore/runtime/Executable.cpp

@@ -120 +120 @@
 }
 
-void FunctionExecutable::compileForCall(ExecState*, ScopeChainNode* scopeChainNode)
+bool FunctionExecutable::compileForCall(ExecState*, ScopeChainNode* scopeChainNode)
 {
     JSGlobalData* globalData = scopeChainNode->globalData;
     RefPtr<FunctionBodyNode> body = globalData->parser->parse<FunctionBodyNode>(globalData, 0, 0, m_source);
+    if (!body)
+        return false;
     if (m_forceUsesArguments)
         body->setUsesArguments();
@@ -142 +144 @@
 
     body->destroyData();
-}
-
-void FunctionExecutable::compileForConstruct(ExecState*, ScopeChainNode* scopeChainNode)
+    return true;
+}
+
+bool FunctionExecutable::compileForConstruct(ExecState*, ScopeChainNode* scopeChainNode)
 {
     JSGlobalData* globalData = scopeChainNode->globalData;
     RefPtr<FunctionBodyNode> body = globalData->parser->parse<FunctionBodyNode>(globalData, 0, 0, m_source);
+    if (!body)
+        return false;
     if (m_forceUsesArguments)
         body->setUsesArguments();
@@ -166 +171 @@
 
     body->destroyData();
+    return true;
 }
 
@@ -194 +200 @@
 void FunctionExecutable::generateJITCodeForCall(ExecState* exec, ScopeChainNode* scopeChainNode)
 {
-    CodeBlock* codeBlock = &bytecodeForCall(exec, scopeChainNode);
+    CodeBlock* codeBlock = bytecodeForCall(exec, scopeChainNode);
     m_jitCodeForCall = JIT::compile(scopeChainNode->globalData, codeBlock, &m_jitCodeForCallWithArityCheck);
 
@@ -205 +211 @@
 void FunctionExecutable::generateJITCodeForConstruct(ExecState* exec, ScopeChainNode* scopeChainNode)
 {
-    CodeBlock* codeBlock = &bytecodeForConstruct(exec, scopeChainNode);
+    CodeBlock* codeBlock = bytecodeForConstruct(exec, scopeChainNode);
     m_jitCodeForConstruct = JIT::compile(scopeChainNode->globalData, codeBlock, &m_jitCodeForConstructWithArityCheck);
 
@@ -227 +233 @@
 {
     RefPtr<FunctionBodyNode> newFunctionBody = globalData->parser->parse<FunctionBodyNode>(globalData, 0, 0, m_source);
+    if (!newFunctionBody)
+        return 0;
     if (m_forceUsesArguments)
         newFunctionBody->setUsesArguments();
@@ -256 +264 @@
 {
     RefPtr<EvalNode> newEvalBody = globalData->parser->parse<EvalNode>(globalData, 0, 0, m_source);
+    if (!newEvalBody)
+        return 0;
 
     ScopeChain scopeChain(scopeChainNode);