Reviewed by Geoff.

        - fixed <rdar://problem/5197621> closing second window crashed webkit (13660)
        http://bugs.webkit.org/show_bug.cgi?id=13660

        No test case; not testable.

        * page/mac/FrameMac.mm:
        (WebCore::Frame::cleanupPlatformScriptObjects): Check if the interpreter is null;
        if so, we don't want to do work that may lazily create it while the Frame is being
        destroyed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 00a5be506cb1eeff675eb8606a4c62e73314a04b..4c00e4ad66cc2871ee0a5b9cfbd0e08e78c48427 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+<<<<<<< .mine
+2007-05-11  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Geoff.
+        
+        - fixed <rdar://problem/5197621> closing second window crashed webkit (13660)
+        http://bugs.webkit.org/show_bug.cgi?id=13660
+
+        No test case; not testable.
+
+        * page/mac/FrameMac.mm:
+        (WebCore::Frame::cleanupPlatformScriptObjects): Check if the interpreter is null;
+        if so, we don't want to do work that may lazily create it while the Frame is being
+        destroyed.
+
+=======
 2007-05-11  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Brady.
@@ -23,6 +39,7 @@
           Don't create SVG elements for documents that are in dashboard
           compatibility mode
 
+>>>>>>> .r21418
 2007-05-11  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Reviewed by Maciej.

diff --git a/WebCore/page/mac/FrameMac.mm b/WebCore/page/mac/FrameMac.mm
index 8c2609ef320cfc9cd87ecb7f59662c2e5d4fcf72..61a756420f74f9b57f1cfea1391521171ca50cba 100644 (file)
--- a/WebCore/page/mac/FrameMac.mm
+++ b/WebCore/page/mac/FrameMac.mm
@@ -732,7 +732,8 @@ void Frame::cleanupPlatformScriptObjects()
     // (This problem is unique to m_windowScriptObject because its JS/DOM counterparts
     // persist across page loads.)
     removeDOMWrapper(reinterpret_cast<DOMObjectInternal*>(d->m_domWindow.get()));
-    removeJSWrapper(KJS::Window::retrieveWindow(this));
+    if (d->m_jscript->haveInterpreter())
+        removeJSWrapper(KJS::Window::retrieveWindow(this));
     d->m_windowScriptObject = 0;
 }