2007-05-12 Eric Seidel <eric@webkit.org>

        Reviewed by mjs.

        Crash starting Safari with JavaScript disabled.
        http://bugs.webkit.org/show_bug.cgi?id=13691

        Test: none possible.

        * page/mac/FrameMac.mm:
        (WebCore::Frame::cleanupPlatformScriptObjects): NULL check d->m_script

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 73440f80252518571555fa561ddaa08823ffbb1b..5fdf6cda0bdad18a4de30c936c90fa751b5ed0d2 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-12  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by mjs.
+
+        Crash starting Safari with JavaScript disabled.
+        http://bugs.webkit.org/show_bug.cgi?id=13691
+        
+        Test: none possible.
+
+        * page/mac/FrameMac.mm:
+        (WebCore::Frame::cleanupPlatformScriptObjects): NULL check d->m_script
+
 2007-05-11  David Hyatt  <hyatt@apple.com>
 
         Fix for http://bugs.webkit.org/show_bug.cgi?id=13688, Colloquy is broken!

diff --git a/WebCore/page/mac/FrameMac.mm b/WebCore/page/mac/FrameMac.mm
index 61a756420f74f9b57f1cfea1391521171ca50cba..204004cafd0d7a88084c41b7c2eebffb428e976a 100644 (file)
--- a/WebCore/page/mac/FrameMac.mm
+++ b/WebCore/page/mac/FrameMac.mm
@@ -732,7 +732,7 @@ 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()));
-    if (d->m_jscript->haveInterpreter())
+    if (d->m_jscript && d->m_jscript->haveInterpreter())
         removeJSWrapper(KJS::Window::retrieveWindow(this));
     d->m_windowScriptObject = 0;
 }