Commit 832e37f2 authored by cwzwarich@webkit.org's avatar cwzwarich@webkit.org

2008-07-07 Cameron Zwarich <cwzwarich@uwaterloo.ca>

        Reviewed by Geoff.

        Bug 19926: URL causes crash within a minute
        <https://bugs.webkit.org/show_bug.cgi?id=19926>

        Add a check that lastGlobalObject is non-null in Machine::execute()
        before copying its globals to the current register file.

        In theory, it is possible to make a test case for this, but it will
        take a while to get it right.

        * VM/Machine.cpp:
        (KJS::Machine::execute):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@35053 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e6f0b89c
2008-07-07 Cameron Zwarich <cwzwarich@uwaterloo.ca>
Reviewed by Geoff.
Bug 19926: URL causes crash within a minute
<https://bugs.webkit.org/show_bug.cgi?id=19926>
Add a check that lastGlobalObject is non-null in Machine::execute()
before copying its globals to the current register file.
In theory, it is possible to make a test case for this, but it will
take a while to get it right.
* VM/Machine.cpp:
(KJS::Machine::execute):
2008-07-07 Darin Adler <darin@apple.com>
Rubber stamped by Adele.
......@@ -709,7 +709,7 @@ JSValue* Machine::execute(ProgramNode* programNode, ExecState* exec, ScopeChainN
(*profiler)->didFinishAllExecution(exec);
}
if (m_reentryDepth && globalObject != lastGlobalObject)
if (m_reentryDepth && lastGlobalObject && globalObject != lastGlobalObject)
lastGlobalObject->copyGlobalsTo(m_registerFile);
m_registerFile.shrink(oldSize);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment